mirrors/NewPipe
1
0
Fork 0
mirror of https://github.com/TeamNewPipe/NewPipe synced 2025-11-18 16:15:14 +00:00
Code Issues Releases Wiki Activity

Updated How to merge a PR (markdown)

Allan Nordhøy
2019-04-24 01:42:50 +02:00
parent 22b27c59a2
commit 7ab4ee3584
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
How-to-merge-a-PR.md

@@ -1,13 +1,13 @@
1. Create you PR (ideally ask in an issue if that is a good idea what you want to do) 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 2. Wait for a maintainer review
3. Do the requested changes 3. Do the requested changes
4. Rebase with `dev` if its necessary: 4. Rebase with `dev` if it is necessary:
```bash ```bash
git checkout dev git checkout dev
git pull git pull
git checkout <the_branch_im_working_in> git checkout <the_branch_im_working_in>
git rebase dev git rebase dev
## The rebase might consist of several commits so you might have to do this several times after resolving a collision: ## The rebase might consist of several commits, so you might have to do this several times after resolving a collision:
git rebase --continue git rebase --continue
### Check if everything works, and no tests fail. ### Check if everything works, and no tests fail.
``` ```