Resolving a conflict makes the commit list scroll to the top
By wesmhar... on October 21, 2013 04:48 (imported from Google Code)
What steps will reproduce the problem?
- Merge a branch causing a conflict
- Open the commit window and scroll down to a conflicted file
- Resolve the conflict (right click, resolve, or resolve with theirs/min) and note that the commit list scrolls to the top
What is the expected output? What do you see instead?
I would expect that the list would stay in the same place (to ensure that I keep the correct context)
What version of TortoiseGit and msysgit are you using? On
what operating system?
TortoiseGit 18.104.22.168, msysgit 1.8.3 on Windows 7 x64
Please provide any additional information below.
To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information