chore: update contributing guide
This commit is contained in:
+4
-4
@@ -101,11 +101,11 @@ included in the project:
|
|||||||
2. If you cloned a while ago, get the latest changes from upstream:
|
2. If you cloned a while ago, get the latest changes from upstream:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
git checkout master
|
git checkout dev
|
||||||
git pull upstream master
|
git pull upstream dev
|
||||||
```
|
```
|
||||||
|
|
||||||
3. Create a new topic branch (off the main project development branch) to
|
3. Create a new topic branch (off the development branch "dev") to
|
||||||
contain your feature, change, or fix:
|
contain your feature, change, or fix:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
@@ -121,7 +121,7 @@ included in the project:
|
|||||||
5. Locally merge (or rebase) the upstream development branch into your topic branch:
|
5. Locally merge (or rebase) the upstream development branch into your topic branch:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
git pull [--rebase] upstream master
|
git pull [--rebase] upstream dev
|
||||||
```
|
```
|
||||||
|
|
||||||
6. Push your topic branch up to your fork:
|
6. Push your topic branch up to your fork:
|
||||||
|
|||||||
Reference in New Issue
Block a user