It would be nice if the context menu descriptions when resolving a merge conflict would be more informative.

I'm referring to "Merge keeping source changes" and "Merge keeping workspace changes". The user has to know exactly which one is which, making this very error-prone.

I suggest using "mine" and "theirs", as is common in other tools, or if possible, the name of the branch of each version.

So "Merge keeping changes from 'main'" and "Merge keeping changes from 'main/fix-163'" would be much more informative.