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:
https://ampcode.com/threads/T-019bc8a2-dc12-73fe-ae78-bdbd574edf08
https://ampcode.com/threads/T-019bc8ad-052d-7469-b891-439ffceb771c