Updated How to merge a PR (markdown)

Christian Schabesberger 2018-08-28 13:04:24 +02:00
parent 69d96f6dad
commit 22b27c59a2
1 changed files with 4 additions and 1 deletions

@ -2,9 +2,12 @@
2. Wait for a Maintainer review
3. Do the requested changes
4. Rebase with `dev` if its 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.
```