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

Photo and Video Editing APIs and SDKs

Trusted by 150 million+ creators and businesses globally

Unlock Picsart's full editing suite by embedding our Editor SDK directly into your platform. Offer your users the power of a full design suite without leaving your site.

Learn More

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
StepSecurity

If you are using GitHub Actions for CI/CD and are worried about the security of CI/CD pipelines, StepSecurity platform is for you. Implement network egress control and CI/CD infrastructure security for GitHub Actions runners. Discover CI/CD risks and GitHub Actions security misconfiguration....

See Software
gitStream

gitStream lets you configure rules that decide how each pull request is treated based on the content of the code. These rules automatically find the right reviewer, check for deprecation, add context tags, and much more. The practice of improving merge efficiency by classifying pull requests...

See Software
Gerrit Code Review

Read old and new versions of files with syntax highlighting and colored differences. Discuss specific sections with others to make the right changes. Gerrit includes Git-enabled SSH and HTTPS servers compatible with all Git clients. Simplify management by hosting many Git repositories together....

See Software