-
Bug
-
Resolution: Duplicate
-
Low
-
None
-
2.0.2
-
None
-
Severity 3 - Minor
When attempting to cherry pick a merge commit, the command fails because there is no -m option specified (mainline parent number).
Though it may not be possible to automatically determine the mainline parent for a merge commit, perhaps allowing the user to simply select the mainline from one of the parents of the merge commit may suffice.
I think the only other place where this issue should arise is when performing a revert of a merge commit, and there is already a ticket for that issue (SRCTREEWIN-593)
- is related to
-
SRCTREE-1026 Support cherry-pick without commit
- Closed
- relates to
-
SRCTREEWIN-593 Reverse Commit does fail if the commit is a merge
-
- Closed
-
[SRCTREE-2897] Cannot cherry pick a merge commit
Workflow | Original: JAC Bug Workflow v3 [ 3370677 ] | New: SRCTREE JAC Bug Workflow [ 3735900 ] |
Workflow | Original: SourceTree Bug Workflow [ 788924 ] | New: JAC Bug Workflow v3 [ 3370677 ] |
Status | Original: Resolved [ 5 ] | New: Closed [ 6 ] |
Resolution | New: Duplicate [ 3 ] | |
Status | Original: Open [ 1 ] | New: Resolved [ 5 ] |
Link |
New:
This issue is related to |
Symptom Severity | New: Minor [ 14432 ] |
Attachment | New: screenshot-1.png [ 147472 ] |
Link |
New:
This issue relates to |
This is important issue as it helps cherry pick whole branch as one commit. Otherwise you have to do it from command line using -m option of git cherry-pick.