Merge commit message when there is a conflict
By vvatas... on April 25, 2010 22:54 (imported from Google Code)
What steps will reproduce the problem?
- Try to merge two branches. TortoiseGit has an option to autogen commit
message. But if there is merge conflict, the autogen message from git is
missing and I type by hand new message at commit dialog.
What is the expected output? What do you see instead?
I'm trying to get detailed autogen commit message from git, instead I
write my own message explaining the commit by hand.
What version of the product are you using? On what operating system?
I'm using TortoiseGit-1.3.6.0-32bit.msi on winXP SP3
Please provide any additional information below.
I'm not sure if this is an issue with git/tortoisegit or I simply don't
know how to use them correctly. Please excuse me if this is not an issue.
There is this tool git-fmt-merge-msg, that can be usefull.
To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information