Updated How to merge a PR (markdown)
parent
69d96f6dad
commit
22b27c59a2
|
@ -2,9 +2,12 @@
|
||||||
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 its necessary:
|
||||||
```
|
```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:
|
||||||
|
git rebase --continue
|
||||||
|
### Check if everything works, and no tests fail.
|
||||||
```
|
```
|
Loading…
Reference in New Issue