Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support skipping merge commits #373

Closed
korthout opened this issue Aug 9, 2023 · 3 comments · Fixed by #375
Closed

Support skipping merge commits #373

korthout opened this issue Aug 9, 2023 · 3 comments · Fixed by #375
Labels
enhancement New feature or request prio: next Planning to work on this issue next

Comments

@korthout
Copy link
Owner

korthout commented Aug 9, 2023

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 korthout added enhancement New feature or request prio: next Planning to work on this issue next labels Aug 9, 2023
@korthout
Copy link
Owner Author

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

FYI @tdonohue @houserx-jmcc

@korthout
Copy link
Owner Author

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

@tdonohue
Copy link

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request prio: next Planning to work on this issue next
Projects
None yet
Development

Successfully merging a pull request may close this issue.

2 participants