I had a merge conflict and wanted to picked the version from the main branch. First I looked at resolve --help (and --help --verbose) but it didn't mention this. Then looked online, and the resolve docs aren't present. ChatGPT tells me I can use --tool internal:other, which did work.

It would be nice if this was mentioned in the docs, or even better exposed as a first-class argument like --theirs / --ours etc.