Git Merge Conflict Helper
Paste a merge conflict block and clearly see the current (HEAD) side vs. the incoming side, side by side.
Paste a block containing Git's conflict markers (<<<<<<<, =======, >>>>>>>) and this tool splits it into the current and incoming sides so you can see exactly what's different.
This tool only helps you read a conflict clearly - the actual resolution and commit must still be done in your own editor and Git client.
What Are Git Conflict Markers?
When a merge or rebase can't automatically reconcile changes to the same lines, Git inserts markers directly into the file: <<<<<<< HEAD starts your current branch's version, ======= separates it from the incoming version, and >>>>>>> branch-name marks the end of the incoming side.
Why Use This Tool?
Conflict markers embedded directly in code can be visually noisy, especially for a large conflict block. Splitting the two sides apart makes it easier to understand what each branch actually changed before deciding how to combine them.
How to Use It
- Paste a block of text containing the conflict markers.
- This tool parses out the "ours"/HEAD section and the incoming section separately.
- Review both sides, then manually write your resolved version in your editor and remove the conflict markers before committing.
Important Notes
This tool never modifies your repository - it only helps you read a conflict block you paste in. Your input is never silently altered or discarded; if no valid conflict markers are found, it tells you clearly rather than guessing.