# How to resolve conflicting agent changes automatically with a chosen resolver with git-ai

Repo: [feder-cr/git-ai](https://github.com/feder-cr/git-ai) | Difficulty: Advanced | Time: 1 hour | Basis: From the README

Plug in a deterministic tool or any LLM provider so conflicting lands resolve instead of bouncing back to the agent.

**Who it is for:** Developer whose agents touch overlapping files and keep getting conflicts returned

**The problem:** Conflicting changes are sent back to their agents, and without a resolver those changes simply do not land.

**The 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

1. Read doc/graft/RESOLVE.md for the resolver protocol
2. Open examples/graft/demo/resolve.toml, the deterministic resolver the README points to
3. Run the benchmark again using that resolver config
4. Compare landed counts with the earlier run without a resolver

## Prompt to paste into your agent

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

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

Disclaimer: Third-party repos we don't own or vouch for. AI-generated use cases can be wrong: review everything and run at your own risk. Full text: https://dedupedai.com/disclaimer/

URL: https://dedupedai.com/use-cases/feder-cr-git-ai/auto-resolve-agent-merge-conflicts/