Implement rebase as a backport strategy

Nathanmalnoury / gh-backport-action

Github action to backport PR.

MIT License

2 stars 4 forks source link

Implement rebase as a backport strategy #4

Open Nathanmalnoury opened 2 years ago

Nathanmalnoury commented 2 years ago

As mentionned in #3; as it can get better along with merge commits than cherry-picking.

The idea is to:

Backport pr_target on top of pr_branch
Push the new branch with a --set-upstream to a new branch
Open PR on the newly created branch

chambm commented 2 years ago

Another issue has come up with cherry picking individual commits instead of the squashed commit: when (re-)squashing the commits in the automated PR, the commit authorship goes to the GitHub bot instead of the original PR's author. If the squashed commit is cherry-picked (or otherwise recreated) in the automated PR, then it can be rebase-merged and authorship of the commit will be preserved. Assuming the squashed commit has the original author, anyway.