Unconflict

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

Project Activity

See All Activity >

License

GNU Library or Lesser General Public License version 2.0 (LGPLv2)

Follow Unconflict

Unconflict Web Site

Other Useful Business Software

Our Free Plans just got better! | Auth0

With up to 25k MAUs and unlimited Okta connections, our Free Plan lets you focus on what you do best—building great apps.

You asked, we delivered! Auth0 is excited to expand our Free and Paid plans to include more options so you can focus on building, deploying, and scaling applications without having to worry about your security. Auth0 now, thank yourself later.

Try free now

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

Related Categories

C# Code Review Software

Registered

2012-06-30

Similar Business Software

Graphite

Streamline Git commands and seamlessly stack pull requests from your terminal. Create and edit stacked PRs visually without leaving your IDE. Stay on top of every PR and review request in one unified inbox. Get immediate, actionable feedback on every pull request with Graphite's codebase-aware...

See Software
Reviewable

You've found the right code review tool. Tracks where participants stand on each discussion, ensuring it won't disappear until resolved. Fully customizable logic determines when a review is complete. Clearly shows net deltas since last time you looked, even if commits got...

See Software
CodeFactor

Get a glance at code quality for the whole project, recent commits, and the most problematic files. CodeFactor will track new and fixed issues for every commit and pull request. CodeFactor will try to show the most critical issues first based on issue code size, file change frequency, and file...

See Software