Git Conflict Resolver
Resolve git merge conflicts visually. Paste conflict markers, compare sides, and choose or edit the resolution.
About This Tool
The Git Conflict Resolver is a free, browser-based tool that helps
you resolve merge conflicts visually without needing to install any
software or use the command line. When two branches modify the same
lines of a file, Git cannot automatically merge them and inserts
conflict markers (<<<<<<<, =======, >>>>>>>) into the file.
This tool parses those markers and presents each conflict as a
side-by-side comparison of the two versions, making it easy to
understand what changed and decide how to resolve it.
For each detected conflict, you can choose from four resolution strategies: Accept Ours keeps your branch's version (HEAD), Accept Theirs keeps the incoming branch's version, Accept Both concatenates both versions in order, and Manual Edit lets you write a completely custom resolution. The resolved output updates in real time as you make decisions, and a progress counter shows how many conflicts you have left to resolve.
The tool supports files with multiple conflicts. Simply paste the entire file contents — including the non-conflicting parts — and every conflict block is extracted and displayed individually. Non-conflicting sections are preserved exactly as they are in the merged output. This makes it convenient to copy the final result and paste it back into your editor or IDE.
If you need to compare two texts without conflict markers, try the Diff Viewer. For building complex Git commands, the Git Command Builder provides a visual interface. And if you are setting up a new repository, the .gitignore Generator can create ignore files for any language or framework.
All processing runs entirely in your browser. No data is uploaded to any server, no requests are made, and nothing is logged. This makes it safe to use with proprietary source code, internal repositories, and sensitive configuration files.
How to Use
- Paste the contents of a file that contains Git conflict markers (
<<<<<<<,=======,>>>>>>>) into the input textarea. - The tool automatically detects and parses all conflict blocks in the input.
- Each conflict is displayed as a card with a side-by-side comparison of "Ours" (HEAD) vs "Theirs" (incoming branch).
- For each conflict, click Accept Ours, Accept Theirs, Accept Both, or Manual Edit to choose the resolution.
- If you chose Manual Edit, type or modify the resolution text in the editor that appears.
- Watch the Resolved Output panel update in real time as you resolve each conflict. The counter shows your progress.
- Click Copy Output or press Ctrl+Shift+C to copy the resolved text to your clipboard. Use Sample to load an example conflict.
Popular Git Conflict Resolution Examples
FAQ
What are Git conflict markers?
Git conflict markers are special lines that Git inserts into a file when it cannot automatically merge changes from two branches. They look like <<<<<<< HEAD, =======, and >>>>>>> branch-name. The text between <<<<<<< and ======= is your current branch's version (ours), and the text between ======= and >>>>>>> is the incoming branch's version (theirs).
Can I resolve multiple conflicts in one file?
Yes. The tool parses the entire file and detects every conflict block. Each conflict is displayed as a separate card, and you can resolve them independently. Non-conflicting lines between conflicts are preserved in the output.
What resolution options are available?
Four options are provided for each conflict: Accept Ours keeps the HEAD version, Accept Theirs keeps the incoming branch's version, Accept Both concatenates both versions (ours first, then theirs), and Manual Edit lets you write a completely custom resolution.
Does this tool modify my Git repository?
No. This tool only processes text you paste into it. It does not connect to any Git repository, does not execute any Git commands, and does not modify any files on your system. You need to manually copy the resolved output and paste it back into your file.
Is my data safe?
Yes. All processing runs entirely in your browser using JavaScript. No data is sent to any server. You can verify this by checking the Network tab in your browser's developer tools while using the tool.
Can I use this for non-Git merge conflicts?
The tool specifically looks for the standard Git conflict marker format (<<<<<<< / ======= / >>>>>>>). If your merge tool or VCS uses the same marker format, it will work. Other conflict formats (such as diff3 with ||||||| markers) are not currently supported.
What happens to unresolved conflicts in the output?
Any conflict that you have not resolved will keep its original conflict markers in the output. This means you can partially resolve a file, copy the output, and continue resolving the remaining conflicts later in your editor.
Related Tools
Diff Viewer
Compare two texts side by side with line-by-line and character-level diff highlighting.
Git Command Builder
Build Git commands visually. Select operations, options, and flags to construct the correct git command with explanations.
.gitignore Generator
Generate .gitignore files by selecting languages, frameworks, and IDEs. Combine multiple templates instantly.
JSON Diff
Compare two JSON objects structurally. Detect added, removed, and changed values with key-order-independent diff.
Conventional Commits Linter
Validate commit messages against the Conventional Commits specification. Check type, scope, description, and body format.
Git Branch Name Generator
Convert ticket numbers and titles into clean git branch names with configurable naming conventions.
Changelog Generator
Generate CHANGELOG.md from Conventional Commits. Group by type, add version headers, and export in Keep a Changelog format.
Diff Patch Applier
Apply unified diff patches to text, reverse-apply patches, review hunks, and generate diffs between two texts.