Cherry Pick is not working in case of conflict and empty message.
What steps will reproduce the problem?
- Clone a git repository which has some commits with empty messages. (my was imported from svn)
- -> Show Log -> Cherry Pick Pick a commit with empty message that would cause a conflicts.
- In "Cherry Pick" dialog select "Pick ALL" ( or "Edit ALL" )
Message about conflicts popups. After you solve conflicts there's only "Commit" and "Abort". After you press "Commit" you see a dialog box about an empty commit message BUT YOU CAN NOT "Edit/Split" "Amend" this commit.
What is the expected output? What do you see instead?
Would be much better to have a possibility to edit commit message after resolving the conflicts. Especially if you cherry picked 500+ commits and your only option is to "Abort" the process in the middle.
What version of TortoiseGit and Git are you using? On what operating system?
TortoiseGit 126.96.36.199 (C:\Program Files\TortoiseGit\bin) git version 2.7.0.windows.1 (C:\Program Files\Git\bin; C:\Program Files\Git\mingw64; C:\ProgramData\Git\config)
Windows 7 64bit Professional SP 1
Please provide any additional information below.