conflict-resolution

Easy-to-use CUI for fixing git conflicts

SyncedStore CRDT is an easy-to-use library for building live, collaborative applications that sync automatically.

A scalable global Process Registry and Process Group manager for Erlang and Elixir.

Resolve git merge conflicts in Atom

The open source air traffic simulator

Unified Game Services API for Unity

A library of Conflict-Free Replicated Data Types for JavaScript

Delta State-based CRDTs in Javascript

A small bash script that handles synchronization conflicts with Syncthing. Inspired by 'pacdiff' from Arch Linux.

Elixir counter-part of the Quill.js Delta library. Provides a baseline for Operational Transformation of rich text.

💲 ➕ ➖ ✅ Resolve merge conflict from command line, in one file, using given strategy (--ours, --theirs, --union)

A little plugin to help you resolving this nasty conflicts.

Half automatic merge toolchain for git

Finding and Understanding Conflicts Between JavaScript Libraries

List of resources related to realtime collaboration

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.

A simple CLI tool that identifies duplicate JARS in a directory. It can remove them also if desired.

syntactic merge tool for java

Conflict resolution for multiple vehicles in tight spaces

An R package for simulating Generalised Management Strategy Evaluation