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

Pre-alpha screenshot

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

You Might Also Like
Gain insights and build data-powered applications Icon
Gain insights and build data-powered applications

Your unified business intelligence platform. Self-service. Governed. Embedded.

Chat with your business data with Looker. More than just a modern business intelligence platform, you can turn to Looker for self-service or governed BI, build your own custom applications with trusted metrics, or even bring Looker modeling to your existing BI environment.
Try it 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
Report inappropriate content