Git Conflict Resolver

Visualize and resolve Git merge conflict markers

Conflict text input

How to use

Paste the file content containing Git merge conflicts
Choose which version to keep for each conflict block
Copy the resolved result and save it to the file
Choose manual edit to replace with your own content

Related Tools

View all Workflow tools

Explore tools that pair well with this one.

Commit Message Builder

Conventional Commits message builder

Dependency Checker

Check latest dependency versions

Step-by-step regex matcher

Git Conflict Resolver | Developer Tools