Conflicts

In this chapterResolve conflicts and continue the operation safely.

A conflict happens when two branches changed the same lines. A banner shows the merge, rebase or cherry-pick in progress, with Continue, Skip and Abort.

1. Try Resolve simple conflicts: it fixes every safe case (same change on both sides, only one side changed, spacing only) in all files, and lists what’s left.
2. Open a file in the conflict editor: choose Accept yours / theirs / both for each block, edit by hand, or switch to the 3-way view (original, yours, theirs above the result).
3. Smart resolve fixes the safe blocks in the open file.
4. When the last file is resolved, click Continue.

Reuse resolutions (rerere) remembers how you resolved a conflict and offers it next time. External merge tools (Beyond Compare, Meld, P4Merge, VS Code…) are available from a conflict’s menu.