All Categories → No Category → conflict-resolution

Top 7 conflict-resolution open source projects

Fac
Easy-to-use CUI for fixing git conflicts
git-resolve-conflict
💲 ➕ ➖ ✅ Resolve merge conflict from command line, in one file, using given strategy (--ours, --theirs, --union)
SyncedStore
SyncedStore CRDT is an easy-to-use library for building live, collaborative applications that sync automatically.
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.
syncthing-resolve-conflicts
A small bash script that handles synchronization conflicts with Syncthing. Inspired by 'pacdiff' from Arch Linux.
ConflictJS
Finding and Understanding Conflicts Between JavaScript Libraries
1-7 of 7 conflict-resolution projects