conflict-resolution repositories

Trending repositories tagged conflict-resolution, ranked by trending score. Updated daily.

  1. 1
    ostinelli/syn

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

    GitHub · Erlang · 705 stars · 89 forks · +3 stars in 24 hours · Trending score 1.09

  2. 2
    chojs23/ec

    Terminal-native 3-way git mergetool and diff viewer

    GitHub · Go · 322 stars · 7 forks · 0 stars in 24 hours · Trending score 1.04

  3. 3
    mgillr/crdt-merge

    Conflict-free merge for DataFrames, JSON, ML models & distributed agents — powered by CRDTs. The first merge library where every operation is mathematically guaranteed to converge.

    GitHub · Python · 9 stars · 1 forks · +2 stars in 24 hours · Trending score 0.82

  4. 4
    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.

    GitHub · TypeScript · 199 stars · 12 forks · +1 stars in 24 hours · Trending score 0.69

  5. 5
    NayJi7/gitoui

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

    GitHub · Rust · 145 stars · 5 forks · 0 stars in 24 hours · Trending score 0.52

  6. 6
    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.

    GitHub · Rust · 1,361 stars · 50 forks · 0 stars in 24 hours · Trending score 0.51

  7. 7
    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.

    GitHub · TypeScript · 167 stars · 3 forks · +1 stars in 24 hours · Trending score 0.45

  8. 8
    DanceNitra/inspeximus

    The self-correcting memory layer for AI agents. Zero-dependency Python memory and MCP server. Supersede, revert, or forget a value deterministically. Verifiable erasure, witness-backed tamper-evident receipts, EU AI Act ready.

    GitHub · Python · 8 stars · 1 forks · 0 stars in 24 hours · Trending score 0.22

  9. 9
    jakub-g/git-resolve-conflict

    :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)

    GitHub · Shell · 51 stars · 11 forks · 0 stars in 24 hours · Trending score 0.10

  10. 10
    smaramwbc/statewave-multi-agent-memory

    Multi-agent demo for Statewave conflict resolution. Concurrent agents write to a shared subject; the compiler detects contradicting facts via Jaccard similarity and supersedes the stale one with provenance. FastAPI + SSE, Apache-2.0.

    GitHub · Python · 29 stars · 7 forks · 0 stars in 24 hours · Trending score 0.00

  11. 11
    GitStudioHQ/merge-studio

    The merge editor for VS Code and Cursor — a real three-pane merge editor with color ribbons, a conflicts dashboard, undo history, and a side-by-side diff.

    GitHub · TypeScript · 7 stars · 1 forks · 0 stars in 24 hours · Trending score 0.00

  12. 12
    alphaparkinc/genpark-agent-conflict-resolution-merger-skill

    3-way operational transform / conflict resolution merger for multi-agent concurrent writes to code/documents with rollback journals

    GitHub · Python · 7 stars · 0 forks · 0 stars in 24 hours · Trending score 0.00