I've never had an agent fail VCS conflict resolution yet. A modern VCS should automatically defer to agents for resolution and in addition to showing the conflict, show the proposed resolution with an easy way to say "yes/no/edit" in a tight CLI loop.

It doesn't require any smart prompting. It always figures it out and just does the right thing.

Examples:
ampcode.com/threads/T-019bc8a2

ampcode.com/threads/T-019bc8ad

0

If you have a fediverse account, you can quote this note from your own instance. Search https://hachyderm.io/users/mitchellh/statuses/115906995948447071 on your instance and quote it. (Note that quoting is not supported in Mastodon.)