You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
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.
The text was updated successfully, but these errors were encountered:
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.
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.The text was updated successfully, but these errors were encountered: