search

korthout / backport-action

Fast and flexible GitHub action to cherry-pick merged pull requests to selected branches
MIT License
61 stars 26 forks source link

Support skipping merge commits #373

Closed korthout closed 1 year ago

korthout commented 1 year ago

Is your feature request related to a problem? Please describe. Repositories commonly update pull requests with changes from the base using a merge commit. But, the action does not support the cherry-picking of merge commits. So, it fails to backport.

Describe the solution you'd like We can allow users to decide how to deal with merge commits using a new input. This input defaults to the current behavior and allows users to skip merge commits instead.

Describe alternatives you've considered Alternatively, the mainline flag can be used to decide how to cherry-pick the merge commit. We consider this a separate feature request which is covered by #341. If you have a need for that, please let us know there.

korthout commented 1 year ago

Released in v1.4.0, v1.4, and v1, which now support the new merge_commits input.

FYI @tdonohue @houserx-jmcc

korthout commented 1 year ago

@dlavrenuek I think you may also be interested in this new input.

tdonohue commented 1 year ago

Thank you so much @korthout ! I just got around to testing this new merge_commits: 'skip' option and it works perfectly for our needs. Merge commits are skipped automatically and not included in the port PR.