Sync current branch with origin/main when a GitHub PR has conflicts. Merges with zdiff3 conflict style, commits conflict markers separately, resolves code conflicts, then runs on-task-done to regenerate golden fixtures and test.
Resolve GitHub PR conflicts by merging origin/main into the current branch.
git fetch origin main
git -c merge.conflictstyle=zdiff3 merge origin/main
If the merge produces conflicts, commit the conflict markers without resolving them first. This records the raw conflict state in a dedicated commit, separate from the resolution.
git add -A
git commit -m "merge origin/main (conflicts unresolved)"
After committing the unresolved state:
on-task-donegit add -A
git commit -m "resolve merge conflicts"
on-task-done to regenerate golden fixtures and testmise run on-task-done
This will format, clippy-fix, regenerate golden fixtures, and run tests — automatically fixing any golden fixture conflicts.
-c merge.conflictstyle=zdiff3 so the merge base is visible in conflict markers (with zealous zdiff3 reducing noise)mise run on-task-done handles them