Advanced Git Merging

Conflict Marker Style

Default hides the common ancestor. Show it:

git config --global merge.conflictStyle zdiff3   # git 2.35+; else diff3
git checkout --conflict=diff3 path               # re-render existing conflict

Markers become <<<ours / ||| base / === / theirs >>> — resolution is far easier.

Side-Picking

git checkout --ours path
git checkout --theirs path
git add path