What it is
A three-way merge compares two edited versions (Ours and Theirs) against the common ancestor (Base). Changes made by only one side are accepted automatically; when both sides changed the same lines differently, you get a conflict to resolve.
When to use it
Use it when git stops a merge, rebase or cherry-pick and you want to see both sides before choosing. Paste the conflicted file, or paste the three versions from git show :1:file, :2:file and :3:file.
Gotchas & limits
Git's default conflict style has no base section, so Base stays empty; run git config merge.conflictStyle zdiff3 to include it. Adjacent edits count as conflicts, like in git. Everything is processed locally, and what you paste is kept only in this browser session.