Git Conflict Resolver | Resolve Merge Conflicts

Git conflict resolver for files with <<<<<<< markers: pick ours, theirs, both or base for each conflict and copy the clean file. Handles diff3 and zdiff3. Designed specifically for developers and professionals, this free online utility runs entirely in your browser to process tasks quickly and securely. Enjoy unlimited usage with no data tracking and no registration required.

Also known as: git conflict resolver · git conflict resolver online · resolve merge conflicts online · merge conflict resolver · git merge conflict markers · accept ours or theirs online · diff3 conflict viewer · zdiff3 merge conflict

git and version control tools

developer utilities

utilities

Conflicted File

Resolved File

About Git Conflict Resolver

Resolve Git merge conflicts one hunk at a time without an IDE. Paste a file that contains conflict markers, choose ours, theirs, both or the common base for each conflict, and copy the clean file back into your repository before running git add.

Key Features

Finds every <<<<<<<, ||||||| and >>>>>>> block and shows ours, base and theirs side by side
Resolves each conflict independently, so lines Git already merged cleanly stay exactly as they are
Reads the default merge style as well as diff3 and zdiff3, including the base section when it is present
Keeps unresolved conflicts with their markers in the output, so nothing is silently dropped
Preserves CRLF line endings and the trailing newline of the original file

Use Cases

Resolve a conflict from a pull request when you are on a machine without VS Code or a merge tool
Take theirs for one hunk and ours for another in a config file such as a Kubernetes manifest for us-east-1
Check what the common ancestor looked like before deciding, using a zdiff3 conflict
Clean up a file you pasted into a ticket or chat that still has conflict markers in it
Teach a new developer what each marker means with a real conflict instead of a diagram

Supported Formats

Git merge markers

diff3

zdiff3

CRLF and LF files

Related Keywords

git conflict resolver

git conflict resolver online

resolve merge conflicts online

merge conflict resolver

git merge conflict markers

accept ours or theirs online

diff3 conflict viewer

zdiff3 merge conflict

Is choosing ours here the same as git checkout --ours?

No. git checkout --ours replaces the whole file with your branch's version, which also throws away changes the other branch made elsewhere in the file that Git had merged cleanly. Choosing ours in this tool only decides the conflicting hunks and keeps every cleanly merged line, which matches git merge-file --ours. After copying the result back, run git add on the file to mark it resolved.

Privacy & Security

All processing happens locally in your browser. Your data never leaves your computer, ensuring complete privacy and security.

Liked this tool?

DevToolLab is free to use. If this utilitie saved you some time today, please consider supporting our work.

Buy us a coffee ☕

Frequently asked questions

What is Git Conflict Resolver used for?

Git conflict resolver for files with <<<<<<< markers: pick ours, theirs, both or base for each conflict and copy the clean file. Handles diff3 and zdiff3.

Is Git Conflict Resolver free to use?

Yes. Git Conflict Resolver is completely free with no usage limits, and there is no paid tier required to use it.

Do I need an account to use Git Conflict Resolver?

No. Git Conflict Resolver works immediately in your browser with no signup, login, or email address required.

Related Tools

Diff Checker Online | Text Comparison Tool

Compare two texts and find differences with side-by-side and unified views. Highlight changes at word or character level with clean, intuitive interface.

text tools

git and version control tools

Chmod Calculator | Linux File Permission Calculator Online

chmod calculator converts Linux file permissions between octal (755) and symbolic (rwxr-xr-x) formats visually. Free, browser-based, and no login needed.

social media tools

code formatters and minifiers

World Clock Online | Global Time Tracker

Track time across multiple cities and timezones simultaneously. Features real-time updates, DST support, day/night indicators, and time comparison table.

date and time tools

utilities

Love Calculator | Love Compatibility Test by Name

Find your love compatibility percentage! Enter two names and get instant love score, compatibility breakdown across 8 traits, and fun results to share. Perfect for Valentine's Day.

encoding and decoding tools

math calculators

Random List Picker Online | Pick Random Item from List

Pick a random item from any list instantly. Paste names, options, or items and let the tool randomly select one or multiple entries. Perfect for giveaways, decisions, and classroom picks.

html tools

random generators

More Tools You Might Like

Pastebin Online | Share Code & Text Snippets Free

Popular

Share code snippets, logs, and text with a shareable link. Syntax highlighting for 30+ languages, expiration controls, and password protection for Pro users.

text tools

password and key generators

math calculators

utilities

Use Tool

URL Tracker & Link Shortener | Track Clicks

Popular

Create short, trackable URLs with detailed click analytics. Track visitor location, devices, referrers, and more. Password protection & QR codes included.

text tools

password and key generators

url and link tools

networking

Use Tool

Webhook Receiver & Inspector | Test HTTP Webhooks

Popular

Generate a unique URL to easily test, receive and inspect HTTP webhooks in real-time. View request headers, query parameters, JSON payloads, and more.