Input with Conflicts
⌘↵ Run
Git Conflict Resolver Online — Side-by-Side Merge Conflict Tool
Git Conflict Resolver
Visually resolve Git merge conflicts by picking current, incoming, or both versions.
A specialized tool for resolving Git merge conflicts without leaving your browser. Simply paste your file content containing Git conflict markers (<<<<<<<, =======, >>>>>>>). The tool automatically parses each conflict and provides a side-by-side interface to select the 'Current' (HEAD), 'Incoming', or 'Both' versions. You can also manually edit the resolution for complex cases. Features include bulk resolution (Accept All Current/Incoming), syntax highlighting awareness, and instant clean output generation. Ideal for quick fixes or when you don't have a local merge tool available.
Keywords: git conflict resolver, merge conflict resolver online, resolve git conflicts online, git merge tool online, visual conflict resolver, git conflict markers, <<<<<<< ======= >>>>>>>, git rebase conflict, resolve merge conflicts online free, git conflict marker resolver
Tags: git, conflict, merge, resolver, vcs, diff
Popular Text & Data tools
- JSON FormatterPrettify, minify, and validate JSON data instantly.
- JSON Repair ToolRepair and fix malformed JSON data from AI outputs and copy-paste.
- Base64 Encode/DecodeEncode and decode Base64 strings, files, and data URIs instantly.
- YAML ConverterConvert between JSON and YAML with validation, formatting, and multi-document support.
- CSV to JSONConvert CSV/TSV to JSON and JSON to CSV with type inference and multiple output formats.
Git Conflict Resolver is also known as: Merge Conflict Resolver, Git Merge Tool, Conflict Marker Resolver.
How to Git Conflict Resolver Online
Copy the content of the file containing Git conflict markers (<<<<<<<, =======, >>>>>>>) and paste it into the input area on the left.
Click the 'Parse Conflicts' button or press ⌘↵ (Mac) / Ctrl+Enter (Windows) to automatically detect all conflict sections in the file.
Review each conflict in the side-by-side view. Click 'Accept Current' to keep HEAD changes, or 'Accept Incoming' to keep the branch changes.
Use 'Both (Current First)' or 'Both (Incoming First)' from the dropdown to keep both versions, or choose 'Manual Edit' to combine them yourself.
Use 'Accept All Current' or 'Accept All Incoming' in the toolbar to bulk-resolve every conflict in the file instantly.
Review the clean, resolved result in the 'Resolved Output' section and click 'Copy' to get your merged file content.
Git Conflict Resolver Features
Visual side-by-side conflict resolution: compare 'Current' and 'Incoming' changes in a clear, horizontal layout.
Automatic conflict marker detection: supports standard Git markers (<<<<<<<, =======, >>>>>>>).
Bulk resolution actions: 'Accept All Current' or 'Accept All Incoming' for fast merge handling in large files.
Manual resolution mode: edit conflict sections directly to combine changes precisely how you need them.
Clean output generation: rebuilds the entire file with your chosen resolutions, ready to be committed.
Conflict statistics: see a count of total conflicts and your resolution progress (e.g. 3/5 resolved).
Keyboard-first workflow: use shortcuts like ⌘⇧A for all current, ⌘⇧I for all incoming, and ⌘⇧C to copy the result.
Zero data leakage: all parsing and resolution happen in your browser. Your source code is never sent to a server.
Syntax-agnostic: works with any text file, including code (JS, TS, Python, Go, Rust), configuration (JSON, YAML, XML), and documentation.
Frequently Asked Questions
- Is this Git conflict resolver free?
- Yes, the Git Conflict Resolver is 100% free and runs entirely in your browser. No subscription or account is required.
- Is my code safe when using this tool?
- Yes. This tool uses pure JavaScript to parse and resolve conflicts locally on your machine. Your code is never uploaded to any server or shared with third parties.
- What are the common Git conflict markers?
- Git uses '<<<<<<< HEAD' to mark the start of your local changes, '=======' to separate your changes from the incoming ones, and '>>>>>>>' followed by a branch name or commit hash to mark the end of the conflict.
- Can I use this for merge, rebase, and cherry-pick conflicts?
- Yes. Any Git operation that results in conflict markers in your source files can be resolved using this tool, as it parses the markers themselves regardless of the operation that created them.
- Does it support 3-way merge views?
- Currently, we provide a 2-way side-by-side view (Current vs Incoming), which covers the majority of common merge conflicts. You can manually combine sections if you need a specific 3-way resolution.
Related Developer Tools
- Text Diff CheckerCompare two text blocks and highlight exactly what changed.
- Text Case ConverterConvert text between 20+ case formats: camelCase, snake_case, kebab-case, Title Case, and more.
- Markdown PreviewPreview and render Markdown with GFM, math, Mermaid diagrams, and export options.
- HTML FormatterFormat, minify, and validate HTML with attribute sorting and template support.