Updated How to merge a PR (markdown)
parent
22b27c59a2
commit
7ab4ee3584
|
@ -1,13 +1,13 @@
|
|||
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
|
||||
4. Rebase with `dev` if its necessary:
|
||||
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:
|
||||
## 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