Reconcile landed contributions by provenance - #296
Closed
hamzamerzic wants to merge 1 commit into
Closed
Conversation
Co-authored-by: Möbius Agent <mobius-agent@users.noreply.github.com>
5 tasks
Collaborator
Author
|
Merged to main as part of #304. The provenance reconciliation and its tests are now in the integrated default-branch change. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Safety model
The updater never infers equivalence from a clean result alone. A witness is created only after the stored review diff re-hashes exactly and is proven in the local source, including a narrow agent-resolved projection proof that requires the same changed path set and independently verifiable non-conflict paths. It becomes authoritative only after GitHub reports the PR merged and the exact reviewed delta is present in that merge commit. Resolution is computed off-tree; shell commits retain both real parents, app updates retain their existing replay transaction, and obsolete landed witnesses are retired only after the update is durable.
Prior work
#147 and #280 manually integrated batches of already-reviewed production changes, preserving provenance but requiring bespoke reconciliation. #282 then reproduced the underlying failure mode directly: its reviewed local commit and GitHub squash commit have identical trees and parents but different identities, while later local work on the same lines made ordinary Git report a three-file conflict. This PR turns that repeated manual reasoning into one shared, fail-closed mechanism.
Validation
git diff --checkpassed