diff options
author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-04-03 21:07:41 +0200 |
---|---|---|
committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-04-03 21:07:41 +0200 |
commit | 0f4a2f12afb14a429485751a394fb566a60c3b33 (patch) | |
tree | 8c4469c5b9397e825a991873a3b0b467febf4d6b /CONTRIBUTING.md | |
parent | af8c598679f14b1f001b6d670b8a8e15a115e274 (diff) |
fixup! CONTRIBUTING: rebase master to staging without pinging people
Diffstat (limited to 'CONTRIBUTING.md')
-rw-r--r-- | CONTRIBUTING.md | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 183db3dac01da..0f8b5faef12dd 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -78,8 +78,19 @@ git rebase --onto=$common $commits git push origin $(git branch --show-current) --force-with-lease ``` -Then change the base branch in the GitHub PR with the "Edit" button in the top -right corner, i.e. `master` → `staging`. +Then change the base branch in the GitHub PR using the *Edit* button in the upper +right corner, and switch from `master` to `staging`. After the PR has been +retargeted it might be necessary to do a final rebase onto the target branch, to +resolve any outstanding merge conflicts. + +```console +# Rebase onto target branch +git rebase upstream/staging +# Review and fixup possible conflicts +git status +# Force push your changes +git push origin $(git branch --show-current) --force-with-lease +``` ## Backporting changes |