Resolving a conflict forces refresh of Commit Dialog
By dmpra... on February 10, 2015 03:02 (imported from Google Code)
What steps will reproduce the problem?
- Merge from one branch to another
- If there are multiple conflicts, push "resolve" to bring up the commit dialog and resolve one.
- Once that one is resolved, the whole commite dialog list refreshes. This can take upwards of 30 seconds, adding an extra 10 minutes to a merge with 20 conflicts.
What is the expected output? What do you see instead?
Don't update the commit dialog unless F5 is pressed.
What version of TortoiseGit and msysgit are you using? On
what operating system?
220.127.116.11 This was not the behaviour of the previous version I had. I recently updated.
Please provide any additional information below.
To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information