merge-conflicts topic
composer-git-merge-driver
Custom git merge driver to minimize merge conflicts in composer.json and composer.lock files
git-imerge
Incremental merge for git
action-conflict-finder
A Github action for finding merge conflicts
vim-mergetool
:cake: Efficient way of using Vim as a Git mergetool
xUnique
merge Xcode project file is so easy
merge-conflicts
Resolve git merge conflicts in Atom
linediff.vim
A vim plugin to perform diffs on blocks of code
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...
git-resolve-conflict
:heavy_dollar_sign: :heavy_plus_sign: :heavy_minus_sign: :white_check_mark: Resolve merge conflict from command line, in one file, using given strategy (--ours, --theirs, --union)
resolve-merge-conflicts
Learn why conflicts happen and how to resolve them.