Skip to content

chore: connect upgrade-sk and PR #64/#65/#66 to current main without tree changes #70

Open

Description

@jsboigeEpita

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:

Preservation-safe repair

Connect the histories with explicit two-parent ours merges:

  1. On upgrade-sk, record current main as a second parent while preserving the complete upgrade-sk tree.
  2. On each PR head, record the repaired upgrade-sk tip as a second parent while preserving that PR's complete tree.
  3. 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

This structural repair is intentionally separate from #69. The supported-SDK matrix modernization remains the next sequential change after ancestry is restored.

Activity

  1. jsboigeEpita commented on Sep 5, 2026

    @jsboigeEpita
    Author

    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.

  2. jsboigeEpita commented on Sep 5, 2026

    @jsboigeEpita
    Author

    Repair delivered — byte-identical fast-forwards

    All four updates were pushed atomically as ordinary fast-forwards (no force-push):

    Post-fetch verification:

    [RELEASED] lane myia-po-2025:CoursIA-2 — acceptance proven; closure/merge disposition left to the coordinator.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions