b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fixup! CONTRIBUTING: rebase master to staging without pinging people

Browse source
This commit is contained in:
Martin Weinelt 2022-04-03 21:07:41 +02:00
parent af8c598679
commit 0f4a2f12af
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
CONTRIBUTING.md
View file

@ -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