repo-sync

Repo Sync

Goals

• Keep the feature branch current with origin/main through rebasing.
• Preserve the branch's intent and the user's changes.
• Resolve conflicts by understanding both sides before editing.
• Rerun the relevant checks after conflict resolution.
• Never introduce a merge commit when synchronizing a feature branch.

Steps

1. Confirm the current branch and working tree with git status --short --branch.

2. If there are uncommitted changes, commit them with the commit skill or stop and ask how to handle them.

3. Enable recorded conflict reuse locally:

   git config rerere.enabled true
   git config rerere.autoupdate true
   

4. Fetch and fast-forward the current branch if the remote branch advanced:

   branch="$(git branch --show-current)"
   git fetch origin
   git pull --ff-only origin "$branch"
   

5. Rebase onto latest main with conflict context:

   git -c merge.conflictstyle=zdiff3 rebase origin/main
   

6. If conflicts occur:

   • Use git status, git diff --merge, and nearby code/tests/docs to understand both sides.
   • Resolve the intended behavior first, then edit.
   • Do not choose ours or theirs for a whole file unless that is clearly correct.
   • Stage each resolution and continue with GIT_EDITOR=true git rebase --continue.
   • Run git diff --check after the rebase completes.

7. Run the relevant checks from AGENTS.md.

8. Verify git rev-list --merges origin/main..HEAD is empty.

9. Push the rewritten branch with git push --force-with-lease, using the previously fetched remote branch as the lease protection.

10. Summarize conflict files, decisions, and validation in the branch notes or handoff comment.

Stop Conditions

• The conflict depends on product intent that is not inferable from the repo, issue, or current user instructions.
• The rebase would drop user changes or alter an external contract without clear confirmation.