Swapped THEIRS and MINE in cherry-pick conflict dialogs and context menus
When cherry-picking another commit (with conflicts) MINE and THEIRS sides are swapped, in both the merge program and context menus ("resolve conflict using mine/theirs"). This is slightly related to #2676 (closed), but I suppose that fix was only partial.
What steps will reproduce the problem?
- Extract the attached repo conflict-swap-test.zip
- Checkout to master
- Cherry-pick the commit in branch2 (ffe943cb994fa76563afa54a09e00acfc90d2681) that adds a line to "file.txt"
- A conflict dialog appears
What is the expected output? What do you see instead?
I'm expecting to see the newly added line in the file on THEIRS side, but it's on MINE. The same swap exists between "Resolve conflict using 'theirs/mine'" context menu items. If you select "Resolve conflict using 'theirs'" you're - in fact - using the MINE file (so you'll end up with an empty commit).
What version of TortoiseGit and Git are you using? On what operating system?
TortoiseGit 184.108.40.206 (TortoiseGit 220.127.116.11 has the same issue) git version 2.6.3.windows.1 Windows 7 x64 (fully updated)
Please provide any additional information below.
Starting from TGit 2.0 (2.1 has the same issue) the THEIRS and MINE sides are swapped. TGit 1.8.6 was ok.