merge-conflicts

Open repos and models their makers tagged merge-conflicts, most starred first. The same for everyone.

Developer toolsRepo

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.

  • 199
  • TypeScript
  • MIT
  • 2 d ago
devlintTake it
Developer toolsRepo

git-pilot

Git autopilot skill for coding agents: your agent writes commits, PR descriptions and conflict resolutions, a pure-Bash CLI does the Git plumbing and safety checks. No API key, no model calls.

  • 0
  • Shell
  • MIT
  • 10 d ago
maxgfrTake it
Search GitHub and Hugging Face for merge-conflicts

Get , open it once and sign in. Then come back here and press the button again.