docs: add upstream sync procedure - #31
Merged
Merged
Conversation
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.
Why
GitHub's "N commits behind" counter is
git rev-list --count HEAD..upstream/master— puregraph reachability, unrelated to whether our files match upstream. Squash-merging an upstream
sync copies content without ancestry, so the counter sticks permanently and
git merge-basestops advancing, which makes every subsequent sync replay already-applied commits as conflicts.
We hit both halves of this on #28: the counter is stuck at 72, and the conflict resolution
silently dropped two upstream commits (recovered separately).
What
SYNC.mddocuments the preferred plain-merge flow, and — for when divergence forces areviewed PR instead — the mandatory audit for dropped commits plus the
git merge -s oursstep that records ancestry without touching the tree.
Docs only, no code changes.