DEDUPED Hot AI repos, turned into use cases Get 5 a day

How to land conflicting agent changes with a deterministic resolver with Git AI

Use the bundled resolve.toml rules so conflicting agent lands get resolved and verified.

Who it is forA team lead running several coding agents on one branch, where the agents often edit the same files and conflicts block their work.

The problemConflicting lands are returned to the agent that made them, which adds retries and manual cleanup across many changes.

The outcomeConflicts that match the configured deterministic rules are resolved and the changes land, with verification run on the exact tree that would land when you enable it.

What you need first

  • Linux or macOS
  • Go 1.26
  • A C toolchain
  • Meson and Ninja (the build compiles a bundled Git)
  • Git and a clone of https://github.com/feder-cr/git-ai.git

Steps

  1. Complete the build and quickstart from the first use case.
  2. Read examples/graft/demo/resolve.toml and list the rules it sets for the conflicts you expect.
  3. Set verify.command and verify.enabled in your server configuration to match your project tests, following the configuration reference in doc/graft/CONFIGURATION.md.
  4. Run examples/graft/demo/acceptance-phase4.sh to reproduce the benchmark with the deterministic resolver.
  5. Compare the number of landed changes with the conflict count reported by the script.

Prompt for your agent

In the repository git-ai, open examples/graft/demo/resolve.toml and summarize its deterministic rules. Then run `examples/graft/demo/acceptance-phase4.sh` and expected output is a count of landed changes; verify that it reports all 250 changes landed when the resolver is enabled.

Caveat. A model based resolution only lands when the verify.command you configure passes, so the verification commands must be set by you and tested on your project.

Share: X LinkedIn Hacker News Email Copy link

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 [email protected] and we will look at it promptly. Full disclaimer page