Git Merge Conflict Viewer
Isolate, analyze, and resolve Git conflict blocks (`<<<<<<<`, `=======`, `>>>>>>>`) cleanly with side-by-side previews.
Paste a file containing Git conflict markers above to start parsing.
Understanding Conflict Markers
1. Current Changes (HEAD)
Enclosed between <<<<<<< HEAD and =======. Represents code in your current checked-out branch.
2. Conflict Separator
The ======= line acts as the dividing line separating your current changes from incoming changes.
3. Incoming Changes
Enclosed between ======= and >>>>>>> branch-name. Represents modifications from the merging branch.