Why it matters
When two people edit the same file, comparing just the two versions can't tell who changed what. A three-way merge also looks at the original, so a line only you changed is taken from you, and a line only they changed is taken from them.
Only when both of you changed the same lines differently is there a real conflict. This tool runs the same diff3 approach Git uses, shows each conflict with both sides, and lets you pick yours, theirs or both, which is handy for config files, content and code outside a repository.
How it works
- InputThe original and two edited versions
- In your browserLines matched against the base, both sides compared
- OutputA merged file, Git-style conflict markers and a resolver
Where it fits in a designer's workflow
- Plan
- Design
- Build
- Test
- Launch
By the numbers
Show the numbers as a table
| Region | Count |
|---|---|
| Unchanged regions | 4 |
| Merged automatically | 1 |
| Conflicts to resolve | 2 |
How to use it
- Paste the original (base) text.
- Paste your version and their version.
- Choose how to show or resolve conflicts.
- Copy or download the merged result.
FAQ
Is it the same as git merge?
It uses the same idea (diff3 on lines). Git adds rename detection and history; for a single file the result is the same.
What counts as a conflict?
Lines changed on both sides, differently. If both made the same change, it's merged without a conflict.
Which marker style should I pick?
Git style shows yours and theirs. diff3 style also shows the base, which makes it easier to see what each side changed.
Is my text uploaded?
No. The merge runs in your browser.
