{
 "schema_version": 1,
 "generated": "2026-10-19",
 "id": "feder-cr-git-ai--auto-resolve-agent-merge-conflicts",
 "repo": "feder-cr/git-ai",
 "repo_url": "https://github.com/feder-cr/git-ai",
 "repo_slug": "feder-cr-git-ai",
 "title": "Resolve conflicting agent changes automatically with a chosen resolver",
 "page_title": "How to resolve conflicting agent changes automatically with a chosen resolver with git-ai",
 "summary": "Plug in a deterministic tool or any LLM provider so conflicting lands resolve instead of bouncing back to the agent.",
 "who": "Developer whose agents touch overlapping files and keep getting conflicts returned",
 "problem": "Conflicting changes are sent back to their agents, and without a resolver those changes simply do not land.",
 "outcome": "Conflicts are resolved through the versioned resolver protocol and all 250 changes in the demo land, as the README describes for the deterministic resolver.",
 "steps": [
  "Read doc/graft/RESOLVE.md for the resolver protocol",
  "Open examples/graft/demo/resolve.toml, the deterministic resolver the README points to",
  "Run the benchmark again using that resolver config",
  "Compare landed counts with the earlier run without a resolver"
 ],
 "agent_prompt": "In feder-cr/git-ai, run the acceptance demo with examples/graft/demo/resolve.toml and report how many of the 250 changes landed. Verify the planned conflicts were resolved rather than returned.",
 "agents": [
  "any"
 ],
 "difficulty": "Advanced",
 "time": "1 hour",
 "basis": "readme",
 "caveat": "The README confirms the deterministic resolver in the demo; how to wire an LLM provider is covered in doc/graft/RESOLVE.md, and a model resolving real code conflicts can still produce wrong merges.",
 "category": "Software & DevOps",
 "tags": [
  "Software & DevOps"
 ],
 "lang": "go",
 "requirements": [
  "Linux or macOS",
  "Go 1.26, a C toolchain, Meson and Ninja (the build compiles a bundled Git)",
  "No paid keys needed; conflict resolution can use any LLM provider, a deterministic tool, or none",
  "SQLite or PostgreSQL plus object storage (file, S3, GCS, Azure) only if you move the repo state off local Git"
 ],
 "risk": "none",
 "seen_in_the_wild": false,
 "best": false,
 "score": 0.536,
 "evidence": [],
 "url": "https://dedupedai.com/use-cases/feder-cr-git-ai/auto-resolve-agent-merge-conflicts/",
 "md": "https://dedupedai.com/use-cases/feder-cr-git-ai/auto-resolve-agent-merge-conflicts/index.md",
 "disclaimer": "Deduped lists open-source repositories that belong to other people. We do not own, maintain, audit, or vouch for any of them, and a repo appearing here is not an endorsement or a safety check. The use cases, steps, and prompts are written by AI and may be incomplete, outdated, or just wrong. Where a use case is marked \"Seen in the wild\", we link to public posts where someone described something similar, but we have not verified those posts and the use case itself is still our AI's own write-up. Use all of this at your own risk. Only run code, commands, or agents on systems and accounts you are authorized to use, and read the code and every command before you run it, especially anything that touches credentials, files, or the network. Nothing here is professional, security, legal, or financial advice. All trademarks and project names belong to their respective owners, and their use here does not imply affiliation. Content is provided as is, without warranties of any kind. Found a mistake, a safety problem, or something you want removed? Email hello@dedupedai.com and we will look at it promptly."
}