Git Merge Conflict Resolver

Git Merge Conflict Resolver: free online, no upload

Git Merge Conflict Resolver is a free online tool for developers, DevOps engineers and students learning to code. Resolve Git conflict markers visually with Ours/Theirs/Both. It works instantly in any modern browser on Windows, Mac, Android and iPhone, with no installation, no sign-up and no limits. Your code, data and API payloads are processed on your own device using the open-source kpdecker/jsdiff library, so nothing is uploaded and your privacy is protected. People use it when they search for git, merge conflict, diff.

How to use Git Merge Conflict Resolver

1. Open the tool: Open Git Merge Conflict Resolver on this page. It loads in a few seconds and runs inside your browser tab.
2. Add your input: Add your code, data and API payloads or type the values. Nothing is uploaded to any server.
3. Adjust and preview: Change the options and check the live preview until the result is exactly what you need.
4. Download or copy: Download the result or copy it. You can repeat it as many times as you like, free.

Key features

• Resolve Git conflict markers visually with Ours/Theirs/Both
• 100% free and unlimited, with no watermark, no credits and no paid plan
• Runs locally in your browser for privacy and speed
• Works on mobile, tablet and desktop
• Download, print or copy results instantly

Popular uses

• Speed up daily development work
• Debug and inspect data quickly
• Learn and teach programming concepts

Frequently asked questions

Built with open-source technology: kpdecker/jsdiff.