Git conflict resolver
Resolve conflict markers by keeping ours, theirs or both sides of each hunk.
Runs in your browser. Your input is not uploaded.
Loading the tool…
What it does, how to use it, and questions
What it does
Git writes conflict markers when two branches change the same lines: <<<<<<< starts your side, ======= separates the other side, and >>>>>>> ends the hunk. An optional ||||||| line holds the common base.
This tool finds every hunk in a pasted file and replaces them with ours, theirs, or both, so you can finish a merge without opening the repo.
How to use it
- Paste the conflicted file.
- Choose Ours, Theirs or Both.
- Copy the cleaned text and confirm no markers remain.
Things to watch for
- Both concatenates the two sides. That is rarely valid for code; use it for lists or when you will edit further.
- Nested or malformed markers are reported as an error rather than guessed.
Questions
- What does Ours mean?
- The text between
<<<<<<<and=======(or before|||||||when a base is present). - What does Theirs mean?
- The text between
=======and>>>>>>>. - Can I resolve hunks one by one?
- Not yet. The choice applies to every hunk in the paste.
- Is the file uploaded?
- No. Resolution runs in this page.