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 >

Categories

Code Review

License

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

Follow Unconflict

Unconflict Web Site

Other Useful Business Software
MongoDB Atlas runs apps anywhere Icon
MongoDB Atlas runs apps anywhere

Deploy in 115+ regions with the modern database for every enterprise.

MongoDB Atlas gives you the freedom to build and run modern applications anywhere—across AWS, Azure, and Google Cloud. With global availability in over 115 regions, Atlas lets you deploy close to your users, meet compliance needs, and scale with confidence across any geography.
Start Free
Rate This Project
Login To 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

C#

Related Categories

C# Code Review Software

Registered

2012-06-30