conflict-resolution topic

List conflict-resolution repositories

fac

1.8k
Stars
51
Forks
Watchers

Easy-to-use CUI for fixing git conflicts

SyncedStore

1.6k
Stars
51
Forks
Watchers

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

syn

618
Stars
74
Forks
Watchers

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

merge-conflicts

432
Stars
42
Forks
Watchers

Resolve git merge conflicts in Atom

CloudOnce

248
Stars
48
Forks
Watchers

Unified Game Services API for Unity

bluesky

334
Stars
236
Forks
Watchers

The open source air traffic simulator

js-delta-crdts

191
Stars
16
Forks
Watchers

Delta State-based CRDTs in Javascript

crdts

215
Stars
16
Forks
Watchers

A library of Conflict-Free Replicated Data Types for JavaScript

text_delta

66
Stars
8
Forks
Watchers

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

syncthing-resolve-conflicts

82
Stars
14
Forks
Watchers

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