Cherry pick with conflicts does not add "Cherry picked from..."
By sol... on March 31, 2014 07:12 (imported from Google Code)
What steps will reproduce the problem?
- Cherry Pick some (pushed) code that will cause a merge conflict
- Check the box "Add Cherry Pick from"
- Resolve the conflict manually and mark it as resolved. At this phase, the box "Add Cherry Pick from" is still checked.
- Check the log - the new commit does not show the line or commit ID of the original commit that was cherry picked.
What is the expected output? What do you see instead?
It would be great to keep the "cherry picked from" message even if there are conflicts during the cherry pick operation.
What version of TortoiseGit and msysgit are you using? On
what operating system?
msysgit 1.9.0 or 1.8.3
Please provide any additional information below.
To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information