Browse the Developer Tools station →
What does this tool do?
Git Merge Conflict Resolver: file with merge conflict markers, resolution strategy → conflict hunk analysis, resolved content, unresolved status. Process locally in your browser. Inputs: File with merge conflict markers, Resolution strategy. Outputs: Conflict hunk analysis, Resolved content, Unresolved status.
How to use it?
Provide the listed input and choose Resolve Conflicts. Review the result, then copy or download where available. Clear removes inputs and results.
Browser-local processing. No uploads, content logging, persistence or remote resource loading. Generated markup is inert text; files are treated as untrusted data.
All conflict parsing is performed in browser memory; no Git repositories or branches are modified.
Conflict markers are only removed upon explicit user confirmation.