Repository navigation
chore: connect upgrade-sk and PR #64/#65/#66 to current main without tree changes #70
Copy link
Copy link
Open
Description
Problem
upgrade-sk and current main have no common ancestor. Pull requests #64, #65, and #66 all target upgrade-sk, so GitHub cannot compute their relationship to the maintained line reliably.
Verified refs before repair:
main:168fd5d8bef5301a8f849d95492e815a38af8afbupgrade-sk:c7ce61ffcd757916a981b4892b6d21b6b2dcb461- fix(tests,#7225): document SK 1.78 planning-paradigm decision + re-model samples/Plans + update Skip reasons #64 (
c699-work):a1eb200e6d017910e6e4d51f4e1a2bb69e025b4b - feat(samples,#7225): SK 1.78 plan JSON intermediate format + PlanJsonHelpers helper #65 (
fix/7225-sk178-plan-helper):941ead746629bcdef7ab8536ed29800b21959399 - fix(tests,#7225): rewrite MultiConnectorTests for SK 1.78 + PlanJsonHelpers xUnit suite #66 (
fix/c716-7225-multiconnector-tests-rewrite):4588c478b2d86ff2d0ecbe7591f4af34456d11e1 - common base of fix(tests,#7225): document SK 1.78 planning-paradigm decision + re-model samples/Plans + update Skip reasons #64/feat(samples,#7225): SK 1.78 plan JSON intermediate format + PlanJsonHelpers helper #65/fix(tests,#7225): rewrite MultiConnectorTests for SK 1.78 + PlanJsonHelpers xUnit suite #66:
a95e92f37708354f15861f4f7d11faa9d8d0307c
Preservation-safe repair
Connect the histories with explicit two-parent ours merges:
- On
upgrade-sk, record currentmainas a second parent while preserving the completeupgrade-sktree. - On each PR head, record the repaired
upgrade-sktip as a second parent while preserving that PR's complete tree. - Push all four updates as ordinary fast-forwards. No rebase, cherry-pick, conflict auto-resolution, or force-push.
A local proof run produced byte-identical trees:
| Branch | old tree | repaired tree | result |
|---|---|---|---|
upgrade-sk |
01dd12155c4e8b0dbe048cb8589e0f3f167d68d2 |
01dd12155c4e8b0dbe048cb8589e0f3f167d68d2 |
identical |
c699-work |
7f9b36c1b9cbee8ba3630d4314e3ffebf145ab81 |
7f9b36c1b9cbee8ba3630d4314e3ffebf145ab81 |
identical |
fix/7225-sk178-plan-helper |
75f975505dfad2017323cb575af84245c3f357d5 |
75f975505dfad2017323cb575af84245c3f357d5 |
identical |
fix/c716-7225-multiconnector-tests-rewrite |
8a415dd15809f40ff308d517b5da1ee7ccf8a3de |
8a415dd15809f40ff308d517b5da1ee7ccf8a3de |
identical |
All four repaired tips resolve 168fd5d8bef5301a8f849d95492e815a38af8afb as their merge-base with main.
Acceptance
-
git merge-base main upgrade-sksucceeds. - fix(tests,#7225): document SK 1.78 planning-paradigm decision + re-model samples/Plans + update Skip reasons #64, feat(samples,#7225): SK 1.78 plan JSON intermediate format + PlanJsonHelpers helper #65, and fix(tests,#7225): rewrite MultiConnectorTests for SK 1.78 + PlanJsonHelpers xUnit suite #66 each have a merge-base with current
main. - Every repaired branch keeps the exact tree ID of its pre-repair tip.
- All remote updates are fast-forwards; no force-push.
- GitHub recomputes fix(tests,#7225): document SK 1.78 planning-paradigm decision + re-model samples/Plans + update Skip reasons #64/feat(samples,#7225): SK 1.78 plan JSON intermediate format + PlanJsonHelpers helper #65/fix(tests,#7225): rewrite MultiConnectorTests for SK 1.78 + PlanJsonHelpers xUnit suite #66 without the no-common-ancestor blocker.
This structural repair is intentionally separate from #69. The supported-SDK matrix modernization remains the next sequential change after ancestry is restored.
Reactions are currently unavailable
Metadata
Metadata
Assignees
Labels
No labels
Activity
jsboigeEpita commentedon Sep 5, 2026
Grain: MED/refactor — lane myia-po-2025:CoursIA-2 — prev: MED/refactor #12593
[CLAIMED] lane myia-po-2025:CoursIA-2 — reconnect the four named branches using byte-identical two-parent merge commits; no force-push and no file-content change.
jsboigeEpita commentedon Sep 5, 2026
Repair delivered — byte-identical fast-forwards
All four updates were pushed atomically as ordinary fast-forwards (no force-push):
upgrade-sk:c7ce61f→8a06e2dc699-work/ fix(tests,#7225): document SK 1.78 planning-paradigm decision + re-model samples/Plans + update Skip reasons #64:a1eb200→5b046ebfix/7225-sk178-plan-helper/ feat(samples,#7225): SK 1.78 plan JSON intermediate format + PlanJsonHelpers helper #65:941ead7→69fa2e0fix/c716-7225-multiconnector-tests-rewrite/ fix(tests,#7225): rewrite MultiConnectorTests for SK 1.78 + PlanJsonHelpers xUnit suite #66:4588c47→1bd3b21Post-fetch verification:
168fd5d8bef5301a8f849d95492e815a38af8afbwithmain;MERGEABLEagainst repaired base8a06e2d;UNSTABLEstate is check-related, not a no-common-ancestor condition. SDK-matrix remediation remains the separate sequential scope in ci: la matrice SDK cible 6.0/7.0/8.0-preview (tous EOL) — main rouge depuis 2025-12, 10 PRs dependabot en heritent #69.[RELEASED] lane myia-po-2025:CoursIA-2 — acceptance proven; closure/merge disposition left to the coordinator.