merge-conflicts repositories

Trending repositories tagged merge-conflicts, ranked by trending score. Updated daily.

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

  2. 2
    bharathvbcr/GitPulse

    Fast, local-first Git desktop client, code intelligence suite, and task workspace built with Rust (Tauri 2) and Svelte 5. 100% on-device, zero telemetry.

    GitHub · Rust · 18 stars · 0 forks · 0 stars in 24 hours · Trending score 0.41

  3. 3
    git-carrier/git-carrier

    Git extensions for parking, sharing, and landing merges that stopped at conflicts.

    GitHub · Shell · 20 stars · 0 forks · 0 stars in 24 hours · Trending score 0.17

  4. 4
    AndrewRadev/linediff.vim

    A vim plugin to perform diffs on blocks of code

    GitHub · Vim Script · 510 stars · 24 forks · 0 stars in 24 hours · Trending score 0.14

  5. 5
    JoaquinRuiz/medula

    Several coding agents, one repo, at the same time: a reproducible lab to measure how they coordinate, and Médula, a kernel that decides who waits for whom.

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

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

  7. 7
    agentmash-dev/agentmash-cli

    Your team's coding agents warn each other before they edit the same file. Claude Code, Codex, Cursor and 17 more.

    GitHub · JavaScript · 15 stars · 3 forks · 0 stars in 24 hours · Trending score 0.04

  8. 8
    BucanYu/OmniGit

    🚀 拥有 IntelliJ IDEA 原生体验与 3-Way Merge 冲突合并神器的轻量跨仓库 Git 客户端 | 开源免费 · 毫秒秒开 · 多工程协同

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

  9. 9
    Breadstick-Crumbs/fanout

    Fewer broken merges from parallel Claude Code and Codex sessions: tests every branch merged together before main, and tells each session when another changes code it uses. Works with worktrees. No dependencies.

    GitHub · JavaScript · 5 stars · 0 forks · 0 stars in 24 hours · Trending score 0.01

  10. 10
    GitStudioHQ/gitstudio

    GitStudio — a JetBrains-grade Git experience for VS Code & Cursor

    GitHub · JavaScript · 36 stars · 10 forks · 0 stars in 24 hours · Trending score 0.01

  11. 11
    tapaskar/archwhere

    Mission control for AI coding agents: every PR on the architecture map, an MCP server, a tamper-evident record of who decided what, and which branches in flight will collide.

    GitHub · JavaScript · 6 stars · 0 forks · 0 stars in 24 hours · Trending score 0.00

  12. 12
    mhagger/git-imerge

    Incremental merge for git

    GitHub · Python · 2,853 stars · 133 forks · 0 stars in 24 hours · Trending score 0.00

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

  14. 14
    maturada/gh-prs-monitor

    Claude Code plugin for your GitHub pull requests, in this repository and your others: yours and those waiting on your review, sorted by what needs you. Alerts for failing CI, reviews, comments and conflicts; one-press merge, update branch and re-run CI; ticket links; skills that resolve comments, fix CI, resolve conflicts, review and create PRs.

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