TortoiseGit "Abort merge" should work like "git merge --abort"
By hannes.gaen... on February 20, 2015 09:57 (imported from Google Code)
What steps will reproduce the problem?
- Makes changes to files (for merge conflict), commit
- Make an additional change to an existing file testfile, which will not lead to a conflict, do NOT commit
- Pull -> Create a merge conflict (conflicts for files in #1 (closed))
What is the expected output? What do you see instead?
- If I choose "TortoiseGIT Abort merge" | HARD, then changes in testfile will be thrown away, because a HARD RESET is done
- If I execute "git merge --abort" instead, then changes in testfile will NOT be thrown away...
-> If git Version is >= 1.7.4, just call "git merge --abort"
-> If git Version is >= 1.6.1, just call "git reset --merge"
What version of TortoiseGit and msysgit are you using? On
what operating system?
- TortoiseGIT 1.8.13
- GIT 1.9.5
Please provide any additional information below.