SyncedStore CRDT is an easy-to-use library for building live, collaborative applications that sync automatically.
Easy-to-use CUI for fixing git conflicts
Entity-level git merge driver. Resolves false conflicts git invents when independent agents edit the same file. ~95% reduction vs. line-based merge.
A scalable global Process Registry and Process Group manager for Erlang and Elixir.
The open source air traffic simulator
Your personal EQ coach. Build social skills and learn to handle conflict through realistic role-play and personalized feedback.
Resolve git merge conflicts in Atom
Terminal-native 3-way git mergetool and diff viewer
Unified Game Services API for Unity
A library of Conflict-Free Replicated Data Types for JavaScript
Delta State-based CRDTs in Javascript
The Git client that actually resolves conflicts: 8 deterministic patterns auto-resolve the ones that were never decisions, full trace on the rest. Native (Tauri 2 + Rust), free, MIT.
Real-time sync engine for TypeScript. Keeps a server-side database in sync with offline-first browser clients — optimistic writes, HLC conflict resolution, and end-to-end type inference over WebSocket, SSE, or polling.
Say oui to the smoothest git terminal youser interface.
A small bash script that handles synchronization conflicts with Syncthing. Inspired by 'pacdiff' from Arch Linux.
Agent memory platform.
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)
Half automatic merge toolchain for git
A little plugin to help you resolving this nasty conflicts.
To associate your repository with the conflict-resolution topic, visit your repo's landing page and select "manage topics."