Unconflict

planning

Mergetool specifically for single git conflict files

Add a Review
2 Downloads (This Week)
Last Update:
Download Never download this.
Browse All Files
Windows Mac

Screenshots

Description

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.

Unconflict Web Site

Update Notifications





Write a Review

User Reviews

Be the first to post a review of Unconflict!

Additional Project Details

Intended Audience

Developers

User Interface

.NET/Mono

Programming Language

C#

Registered

2012-06-29
Screenshots can attract more users to your project.
Features can attract more users to your project.

Icons must be PNG, GIF, or JPEG and less than 1 MiB in size. They will be displayed as 48x48 images.