Conflicts during rebase appends "conflicts" to commit message
By joseph.thom... on November 19, 2014 10:42 (imported from Google Code)
What steps will reproduce the problem?
- Rebase a change which will conflict
- Resolve the conflict
- Observe that the commit message has changed to include a list of the conflicts
What is the expected output? What do you see instead?
The commit message should not be changed. This is how it is in vanilla Git, and how it was until very recently in TortoiseGit. A list of conflicts only really makes sense in a merge commit.
What version of TortoiseGit and msysgit are you using? On
what operating system?
Windows 7 64-bit
Please provide any additional information below.
I use Gerrit, which requires that a "Change-Id" be appended to the commit message. I frequently forget to check the commit message and delete the conflicts list, and only realise when Gerrit rejects my commit for not having a Change-Id at the end. I then have to rebase again to amend the commit message.