Three-Way Merge
Resolve merge conflicts by comparing Base, Yours, and Theirs
100% browser-based No data sent to server Free to use
Base Common ancestor
Yours Your changes (HEAD)
Theirs Incoming changes
Paste text into all three panels above to start merging, or .
How It Works
1
Paste your three versions
Base is the common ancestor. Yours is your current branch (HEAD). Theirs is the incoming branch you are merging.
2
Auto-merge runs instantly
Non-conflicting changes are merged automatically. Only regions where both sides changed the same lines require your attention.
3
Resolve each conflict
For each conflict block, choose to accept Yours, Theirs, or Both. Navigate with Prev/Next buttons.
4
Copy the merged result
Once all conflicts are resolved, copy the clean merged text and paste it into your editor or file.