syncing.md — bring the PR up to date
Entry: an open PR has fallen behind its base or has conflicts. Saves nothing. Syncing preserves the
caller's completion mode and defaults to snapshot mode when entered directly; control continues at
checks.md.
git fetch origin, then rebase the branch onto the base — or merge, if the PR's existing history style is merge-based; follow what the PR already does.- Resolve conflicts by understanding both sides: read the conflicting hunks' history
(
git log -pon each side) before choosing. A mechanical "take ours" is how freshly merged work gets silently reverted. - Reassess verification evidence. Apply the spine's final-tree rule to the resulting change. Inspect conflict resolutions, relevant dependency changes, and base commits touching the change's behavior or test surface when deciding which gates were invalidated; use the full bar only when the base moved substantially enough to invalidate it. Changed commit ancestry alone does not force a rerun.
- If step 3 causes a fix, commit it and repeat step 3 against the new head. Push only after evidence
covers the final tree and
git status --porcelainis empty (the spine's point-of-action rule). Use--force-with-leaseafter a rebase, never plain--force.
Red flags: "a rebase happened, so rerun everything" ignores valid evidence; "no conflicts, so every old result still applies" ignores relevant behavior or dependency changes. Reassessing evidence is unconditional; rerunning commands is not.
Next
Read and follow checks.md in the selected completion mode.