Unconflict -- git conflict file manager


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.

Hey, look, a screenshot. Formatted with an awful black border, thanks to Sourceforge's screenshot uploader! The crazy numbers at the start of each line are "match groups," displayed as I debug the conflict engine.

Home page is a bit sparse now. Head here for more information and file downloads. Some more information (though currently very little more) on its development here. Let's also come clean and be clear about this: There are much better diff engines available (that one does line diffs as well), and that example has a version written in C# to boot. The point here is to make a utility that's easy to learn in a day's study, and to build a decent UI to go around it tailored for use with git. And to do this for fun. It's all about itch-scratching, right? And the most painful thing to do in git for me right now is merge conflicts. The tools available don't work exactly as I'd like, so I'd like to make myself a better tool.

Unconflict is licensed under the GNU Lesser General Public License, version 2.1. Why? Funny you should ask. Here's the GNG Manifesto.


Unconflict -- a git conflict file manager, and soon to be mergetool.
Copyright (C) 2012 Ruffin Bailey

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.

This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public
License v2.1 along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA


Please send any questions about this project here with as descriptive a subject as you can make, so I don't miss it.

If I miss it anyway, please email a few more times until I reply and we know you're off of my spam list. Thanks.


SourceForge.net Logo