Skip to content

Allow Cherry Picking on Merged commit #2725

Description

@clintonleroux

There is a scenario where I need to cherry pick on a merged commit.
I think it would be valid to allow a cherry pick on a merged commit, and if the cherry pick would result in no changes coming through, it can either give an error or silently continue without cherry picking.

The scenario where I require this to be allowed is in an iteration based repo, where I need to move a commit up a branch.
The current process I follow to do this is:

  1. Revert the change on the lower branch.
  2. Merge up to the higher branch
  3. Cherry Pick the change to the higher branch

Can you let me know if this is valid, I can submit a PR tomorrow, if it is.

Activity

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions