0
Fix the ours versus theirs terminology.
The names are switched in some situations where 'ours' actually refers to 'theirs' in two different dialogs. You have to look at the git hash to know what is truly happening sometimes. Just remove 'ours' and 'theirs', because it's a bad design paradigm, and often misleading. Simply show the hash and the name of the branch and/or author where those hashes come from.
Customer support service by UserEcho
Conflict resolution has been reworked in 21.1. Also, you may want to enable/disable "Swap ours and theirs ..." option in the Preferences, Conflict Solvers.
Thanks, that's better. What is missing is the git commit hash, though. If I am looking at some LFS tags it's just gibberish compared with gibberish. It would be great if the left/right panes showed what their commit hash was so I can just look at the Graph window and know which is which.