Uploaded image for project: 'Sourcetree For Mac'
  1. Sourcetree For Mac
  2. SRCTREE-2897

Cannot cherry pick a merge commit

XMLWordPrintable

    • Icon: Bug Bug
    • Resolution: Duplicate
    • Icon: Low Low
    • None
    • 2.0.2
    • Git
    • 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)

        1. screenshot-1.png
          screenshot-1.png
          64 kB

            [SRCTREE-2897] Cannot cherry pick a merge commit

            Monique Khairuliana (Inactive) made changes -
            Workflow Original: JAC Bug Workflow v3 [ 3370677 ] New: SRCTREE JAC Bug Workflow [ 3735900 ]
            Monique Khairuliana (Inactive) made changes -
            Workflow Original: SourceTree Bug Workflow [ 788924 ] New: JAC Bug Workflow v3 [ 3370677 ]
            Status Original: Resolved [ 5 ] New: Closed [ 6 ]
            Brian Ganninger (Inactive) made changes -
            Resolution New: Duplicate [ 3 ]
            Status Original: Open [ 1 ] New: Resolved [ 5 ]
            Brian Ganninger (Inactive) made changes -
            Link New: This issue is related to SRCTREE-1026 [ SRCTREE-1026 ]

            ncr_jahoda added a comment -

            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.

            ncr_jahoda added a comment - 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.
            jonah (Inactive) made changes -
            Symptom Severity New: Minor [ 14432 ]
            Martin Price made changes -
            Attachment New: screenshot-1.png [ 147472 ]
            Martin Price made changes -
            Link New: This issue relates to SRCTREEWIN-593 [ SRCTREEWIN-593 ]
            Martin Price created issue -

              Unassigned Unassigned
              martin.price Martin Price
              Affected customers:
              2 This affects my team
              Watchers:
              4 Start watching this issue

                Created:
                Updated:
                Resolved: