Make ghmerge useful for backports#238
Conversation
Provide explicit base commit when rebasing the PR on the target branch; also, use the remote ref to avoid potential stray local commits. Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
|
What's inadequate with |
|
Hm? |
|
Apology, it's |
|
Will take a look at it, thanks! |
t8m
left a comment
t8m
left a comment
There was a problem hiding this comment.
Actually this might be handy sometimes.
nhorman
left a comment
nhorman
left a comment
There was a problem hiding this comment.
Just the one question. I think pick-to-branch is probably sufficient for this work, but this might be a handy additional tool to have in our pocket.
| WHO=$1 | ||
| BRANCH=$2 | ||
| REPO=$3 | ||
| BASE=$4 |
There was a problem hiding this comment.
instead of having to manually specify the base commit here for the rebase, would it be worth auto-computing it by running $(git merge-base HEAD), where base-branch is retrieved from the json of the pr being merged?
There was a problem hiding this comment.
huh, the base branch is retrieved from the github PR here
4 participants
Provide explicit base commit when rebasing the PR on the target branch; also, use the remote ref to avoid potential stray local commits.