“Resolve Using {Mine|Theirs}” naming can lead to confusion and error

I routinely make errors while resolving merge conflicts due to the seemingly inscrutable naming of the “Resolve Using Theirs” and “Resolve Using Mine” commands. In particular, the meaning of “mine” and “theirs” seems to be semantically variable depending on the context in which the conflict has occurred.

For example, “mine” and “theirs” may take on opposite meanings depending whether I'm applying a stash, doing a pull with rebase, a merge, etc. This breaks my brain every time I have to deal with it, because I invariably choose the wrong one based on my interpretation of the language. (Instead I now invariably duck out to an external merge tool and deal with it visually, even though I know it's extra busywork.)

It would be vastly superior if SourceTree could provide contextually-appropriate labels for these commands, such as:

• Resolve Using Stash and Resolve Using Head (when applying a stash)
• Resolve Using Remote and Resolve Using Local (when pulling with rebase from a remote)
• Resolve Using $branchname1 and Resolve Using $branchname2 (when merging locally)
• etc.