Skip to content

Commit 7acd0fe

Browse files
committed
docs: fix git command example
4.3 branch may not exist if a contributor forked upstream long ago.
1 parent b0da9eb commit 7acd0fe

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

contributing/workflow.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ is normally done locally, so that you can resolve any merge conflicts.
8383
For instance, to synchronize **develop** branches:
8484

8585
```console
86-
> git switch develop
8786
> git fetch upstream
87+
> git switch develop
8888
> git merge upstream/develop
8989
> git push origin develop
9090
```
@@ -181,8 +181,8 @@ It is a lot easier to resolve conflicts at this stage.
181181
Synchronize your repository:
182182

183183
```console
184-
> git switch develop
185184
> git fetch upstream
185+
> git switch develop
186186
> git merge upstream/develop
187187
> git push origin develop
188188
```
@@ -253,8 +253,8 @@ do the following:
253253
Synchronize your repository:
254254

255255
```console
256-
> git switch develop
257256
> git fetch upstream
257+
> git switch develop
258258
> git merge upstream/develop
259259
> git push origin develop
260260
```
@@ -298,8 +298,8 @@ Copy the IDs of any commits you made that you want to keep:
298298
Update your `4.3` branch:
299299

300300
```console
301-
> git switch 4.3
302301
> git fetch upstream
302+
> git switch 4.3
303303
> git merge upstream/4.3
304304
> git push origin 4.3
305305
```

0 commit comments

Comments
 (0)