DownloadIt'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
Categories
Code ReviewLicense
GNU Library or Lesser General Public License version 2.0 (LGPLv2)Follow Unconflict
You Might Also Like
With the world of work changed forever, it’s essential to manage your workplace and assets together to effectively create a high-performing environment. The Eptura experience combines the power of workplace management software with asset management, enabling you to effectively operate your building and facilitate hybrid work.
Rate This Project
Login To Rate This Project
User Reviews
Be the first to post a review of Unconflict!