Git Conflict Resolver
Visualize and resolve Git merge conflict markers
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