Paste git merge conflict markers and resolve conflicts with a side-by-side visual editor.
Git Conflict Resolver turns the marker-delimited regions in a conflicted file into opposing editable views. Lines between <<<<<<< and ======= form one alternative, while lines between ======= and >>>>>>> form the other; surrounding text remains shared context. You use those views to compose a marker-free result. The common mistake is treating one side as automatically correct or newer. Git records competing content, but the editor cannot know which behavior the finished program should preserve.
A concrete input and expected output from the current implementation.
Input
theme: <<<<<<< HEAD color: blue ======= color: green >>>>>>> feature/green
Expected output
theme: color: blue
This result keeps the HEAD alternative. The divider, boundary markers, feature label, and unselected green line are omitted from the resolved text.
An ordinary two-way conflict starts with <<<<<<< followed by a label. The first alternative continues until the ======= divider; the second continues until >>>>>>> and its label. The resolver presents those alternatives beside one another so line-level differences are visible. Text outside marked regions is non-conflicting context and belongs in the resolved file.
Use the two panes as sources for the intended final text. A valid resolution can retain either alternative or reconcile lines from both, but it must remove the conflict-control lines themselves. Review every marked block independently. After obtaining the clean text, place it in the working-tree file, test it, and stage it with Git to record that the conflict was addressed.
No. It can expose the alternatives and help assemble clean text, but correctness depends on the purpose of each change. Sometimes one side should replace the other; sometimes both changes are required in a newly edited form. Read the surrounding code, consult the related commits when necessary, and run the project's normal checks afterward.
No. The tool works on the conflict text pasted into the browser and does not change the repository, update the index, or create a commit. Nothing is uploaded. Copy the resolved content into the affected working-tree file, confirm that no conflict markers remain unintentionally, stage the file with Git, and then continue the merge or rebase.
The example and behavioral notes were checked against the browser implementation. Standards and primary references below define the relevant format, formula, or platform behavior.
Format, validate, and beautify JSON with syntax highlighting and error detection.
Encode text or files to Base64 and decode Base64 strings back to their original form.
Format and indent SQL queries for better readability across all major dialects.
Convert HTML markup into clean Markdown syntax with support for tables and lists.
Write Markdown and see the rendered HTML output in real time with live preview.
Visualize unified diffs and patch files with color-coded additions and deletions.