Unconflict Icon

Unconflict

planning

Mergetool specifically for single git conflict files

Add a Review
1 Download (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

KEEP ME UPDATED

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

Thanks for helping keep SourceForge clean.

Screenshot instructions:
Windows
Mac
Red Hat Linux   Ubuntu

Click URL instructions:
Right-click on ad, choose "Copy Link", then paste here →
(This may not be possible with some types of ads)

More information about our ad policies
X

Briefly describe the problem (required):

Upload screenshot of ad (required):
Select a file, or drag & drop file here.

Please provide the ad click URL, if possible:

Get latest updates about Open Source Projects, Conferences and News.

Sign up for the SourceForge newsletter:

No, thanks
Screenshots can attract more users to your project.
Features can attract more users to your project.