Git Conflict Visual Resolver

Paste a conflicted file, resolve blocks visually, and export a clean merged file.

File nameLanguage

1 conflict(s)

1 unresolved

Block copy/download until all conflicts are resolved

Resolve all conflicts to enable export actions.

Paste a file produced by `git merge` or `git rebase` that still contains `<<<<<<<`, `=======`, and `>>>>>>>` markers.

Conflict 1 of 1

Current: HEAD | Incoming: feature-branch | Resolution: current

Final merged output

About

Parses Git merge-conflict markers and gives you a guided view for resolving each block before producing clean output.

Accepted input

Accepts conflicted source text containing <<<<<<<, =======, and >>>>>>> markers. File names help the editor choose a better syntax mode.

How to use

Paste the conflicted file contents or load the sample conflict.
Move through each conflict and choose the current side, incoming side, or a custom merge.
Review the merged output and unresolved-conflict counter.
Copy or download the resolved file once all blocks are settled.

Tips

Language detection improves syntax highlighting, so set a file name when possible.
Use the diff view to confirm your merge keeps the intended behavior from both branches.

Parses Git merge-conflict markers and gives you a guided view for resolving each block before producing clean output.

Accepted input

Accepts conflicted source text containing <<<<<<<, =======, and >>>>>>> markers. File names help the editor choose a better syntax mode.

How to use

Paste the conflicted file contents or load the sample conflict.
Move through each conflict and choose the current side, incoming side, or a custom merge.
Review the merged output and unresolved-conflict counter.
Copy or download the resolved file once all blocks are settled.

Tips

Language detection improves syntax highlighting, so set a file name when possible.
Use the diff view to confirm your merge keeps the intended behavior from both branches.