Merge squash message less useful when there are conflicts
By str... on September 05, 2013 18:12 (imported from Google Code)
What steps will reproduce the problem?
- Choose a branch to merge from that will produce conflicts
- In the merge dialog, select the 'Squash' and 'Message' check boxes
- Leave the message as auto-generated and click OK
- In the commit dialog, click "Resolve"
What is the expected output? What do you see instead?
The commit message says "Conflicts:" followed by the list of files with conflicts. I can't find a way to get it to have the "Squashed commit of the following" message that would appear if there had been no conflicts.
What version of TortoiseGit and msysgit are you using? On
what operating system?
TortoiseGit 1.8.5.0 on Windows 8
Please provide any additional information below.
To upload designs, you'll need to enable LFS and have admin enable hashed storage. More information