FacEasy-to-use CUI for fixing git conflicts
jdimesyntactic merge tool for java
git-resolve-conflict💲 ➕ ➖ ✅ Resolve merge conflict from command line, in one file, using given strategy (--ours, --theirs, --union)
SyncedStoreSyncedStore CRDT is an easy-to-use library for building live, collaborative applications that sync automatically.
ConflictResolverAn 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.
syncthing-resolve-conflictsA small bash script that handles synchronization conflicts with Syncthing. Inspired by 'pacdiff' from Arch Linux.
ConflictJSFinding and Understanding Conflicts Between JavaScript Libraries