8 results found Sort:

mkchoi212
fac mkchoi212
51
1.8k
mit
32
Easy-to-use CUI for fixing git conflicts
go cui git golang utility command-line conflict-resolution
Created 2017-12-29
207 commits to master branch, last one 6 months ago
YousefED
SyncedStore YousefED
51
1.7k
mit
8
SyncedStore CRDT is an easy-to-use library for building live, collaborative applications that sync automatically.
vue yjs crdt react svelte javascript collaboration collaborative offline-first conflict-resolution reactive-programming
Created 2021-05-02
152 commits to main branch, last one 8 months ago
ostinelli
syn ostinelli
74
621
mit
33
A scalable global Process Registry and Process Group manager for Erlang and Elixir.
elixir erlang pubsub cluster elixir-lang process-group process-registry conflict-resolution
Created 2015-06-10
574 commits to master branch, last one 2 years ago
TUDelft-CNS-ATM
bluesky TUDelft-CNS-ATM
237
342
gpl-3.0
42
The open source air traffic simulator
utm wgs84 drones python uspace navaids traffic tudelft aircraft simulation air-transport transportation conflict-detection urban-air-mobility air-traffic-control conflict-resolution transportation-simulation
Created 2015-04-01
2,617 commits to master branch, last one 17 days ago
CloudOnce
CloudOnce CloudOnce
48
249
mit
21
Unified Game Services API for Unity
ios tvos unity android unity3d cloud-save game-center unified-api achievements leaderboards cloud-storage game-services google-play-games conflict-resolution google-play-game-services
Created 2016-06-01
183 commits to main branch, last one 11 months ago
orbitdb-archive
crdts orbitdb-archive
16
215
mit
11
A library of Conflict-Free Replicated Data Types for JavaScript
p2p crdt crdts distributed data-structures conflict-resolution
This repository has been archived (exclude archived)
Created 2016-04-20
92 commits to main branch, last one about a year ago
dschrempf
syncthing-resolve-conflicts dschrempf
14
84
gpl-3.0
8
A small bash script that handles synchronization conflicts with Syncthing. Inspired by 'pacdiff' from Arch Linux.
syncthing conflict-resolution
Created 2017-02-16
31 commits to master branch, last one about a year ago
jakub-g
git-resolve-conflict jakub-g
11
51
mit
3
: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)
git git-mergetools merge-conflicts resolve-conflicts conflict-resolution conflicting-changes
Created 2016-08-24
46 commits to base branch, last one 2 years ago