conflict-resolution 开源项目推荐（273 个）

YousefED /SyncedStore

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

mkchoi212 /fac

Easy-to-use CUI for fixing git conflicts

Ataraxy-Labs /weave

Entity-level git merge driver. Resolves false conflicts git invents when independent agents edit the same file. ~95% reduction vs. line-based merge.

ostinelli /syn

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

TUDelft-CNS-ATM /bluesky

开源的空中交通模拟器

GeminiLight /SocialCoach

Your personal EQ coach. Build social skills and learn to handle conflict through realistic role-play and personalized feedback.

smashwilson /merge-conflicts

Resolve git merge conflicts in Atom

chojs23 /ec

Terminal-native 3-way git mergetool and diff viewer

CloudOnce /CloudOnce

Unified Game Services API for Unity

orbitdb-archive /crdts

A library of Conflict-Free Replicated Data Types for JavaScript

peer-base /js-delta-crdts

Delta State-based CRDTs in Javascript

devlint /GitWand

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.

TimMikeladze /reflectdb

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.

NayJi7 /gitoui

A terminal UI (TUI) for git with a rich commit graph, written in Rust

dschrempf /syncthing-resolve-conflicts

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

Agentscreator /engram-memory

Agent memory platform.

deltadoc /text_delta

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

jakub-g /git-resolve-conflict

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

xgouchet /AutoMergeTool

Half automatic merge toolchain for git

sascha-wolf /sublime-GitConflictResolver

A little plugin to help you resolving this nasty conflicts.