Unconflict

It's difficult to find a good mergetool for git conflict files. WinMerge is a good mergetool for resolving conflicts in files you're merging in git, but when resolving conflicts in conflict files, it only allows changes in "your" file, negating much of its usefulness. Unconflict helps you remove conflicts from git conflict files without losing data.

Project Samples

Project Activity

See All Activity >

License

GNU Library or Lesser General Public License version 2.0 (LGPLv2)

Follow Unconflict

Unconflict Web Site

Other Useful Business Software

$300 Free Credits for Your Google Cloud Projects

Start building on Google Cloud with $300 in free credits. No commitment, no credit card required until you're ready to scale.

Launch your next project with $300 in free Google Cloud credits—no strings attached. Test, build, and deploy without risk. Use your credits across the entire Google Cloud platform to find what works best for your needs. After your credits are used, continue with always-free tier services. Only pay when you're ready to scale. Sign up in minutes and start exploring.

Start Free Trial

Rate This Project

User Reviews

Be the first to post a review of Unconflict!

Additional Project Details

Operating Systems

Mac, Windows

Intended Audience

Developers

User Interface

.NET/Mono

Programming Language

Related Categories

C# Code Review Software

Registered

2012-06-30

Similar Business Software

Reviu

Reviu is a native desktop Git client built for fast review workflows. The free version covers local Git: review diffs in inline or split mode, stage and restore by file or hunk, commit, amend, branch, rebase, cherry-pick, stash, and resolve conflicts, all from a keyboard-first UI with a...

See Software
Aikido Security

Secure your code, cloud, and runtime in one central system. Aikido’s all-in-one security platform is loved by developers and security teams alike with full security visibility, insight in what matters most, and fast/automatic vulnerability fixes. Teams get security done with Aikido thanks...

See Software
Graphite

Streamline Git commands and seamlessly stack pull requests from your terminal. Create and edit stacked PRs visually without leaving your IDE. Stay on top of every PR and review request in one unified inbox. Get immediate, actionable feedback on every pull request with Graphite's codebase-aware...

See Software
Gearset

Gearset is the complete, enterprise-ready Salesforce DevOps platform, enabling teams to implement best practices across the entire DevOps lifecycle. With powerful solutions for metadata and CPQ deployments, CI/CD, testing, code scanning, sandbox seeding, backups, archiving, observability, and...

See Software
MergeMe

MergeMe mirrors GitHub pull requests and GitLab merge requests into Slack as a single, updating notification card per PR/MR. Unlike the official GitHub or GitLab Slack apps, which post a new message for every event, MergeMe edits one message in place as status changes (opened, in review,...

See Software
StepSecurity

If you are using GitHub Actions for CI/CD and are worried about the security of CI/CD pipelines, StepSecurity platform is for you. Implement network egress control and CI/CD infrastructure security for GitHub Actions runners. Discover CI/CD risks and GitHub Actions security misconfiguration....

See Software