All Categories → No Category → merge-conflicts

Top 6 merge-conflicts open source projects

Git Imerge
Incremental merge for git
Xunique
merge Xcode project file is so easy
git-resolve-conflict
💲 ➕ ➖ ✅ Resolve merge conflict from command line, in one file, using given strategy (--ours, --theirs, --union)
revctrl.org
An extract, as complete as I can make it, of content from the revctrl.org wiki
magit-imerge
Magit extension for git-imerge
ConflictResolver
An Xcode Source Editor Extension that helps resolving merge conflicts. There are three options, namely 'Accept theirs', 'Accept Yours', and 'Keep Both'. Only one click and it will make the change for you automatically.
1-6 of 6 merge-conflicts projects