lasers/NewPipe
1
0
Fork 0
mirror of https://github.com/TeamNewPipe/NewPipe synced 2024-11-25 03:29:21 +01:00
Code Issues Projects Releases Wiki Activity

Updated How to get your PR merged (markdown)

Mohammed Anas 2022-05-19 16:38:31 +03:00
parent 16439ecf73
commit 86df86edf1
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
How-to-get-your-PR-merged.md

@ -1,16 +1,15 @@
1. Create you PR (ideally ask in an issue if that is a good idea what you want to do)
2. Wait for a maintainer review
3. Do the requested changes
4. Rebase with `dev` if it is necessary:
```bash
git checkout dev
git pull
git checkout <the_branch_im_working_in>
git rebase dev
## The rebase might consist of several commits, so you might have to do this several times after resolving a collision:
git rebase --continue
### Check if everything works, and no tests fail.
git push --force
### WARNING: it will push your local changes and erase the difference. It is needed after a rebase.
3. Do the requested changes, and answer any questions raised by the reviewer(s)
4. Rebase on `dev` if necessary:
```console
$ git checkout dev
$ git pull
$ git checkout <the_branch_im_working_in>
$ git rebase dev
$ # The rebase might consist of several commits, so you might have to do this several times after resolving a collision:
$ git rebase --continue
$ # Check if everything works, and no tests fail.
$ git push --force
$ # WARNING: it will push your local changes and erase the difference. It is needed after a rebase.
```