File tree Expand file tree Collapse file tree 1 file changed +4
-4
lines changed Expand file tree Collapse file tree 1 file changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -83,8 +83,8 @@ is normally done locally, so that you can resolve any merge conflicts.
83
83
For instance, to synchronize ** develop** branches:
84
84
85
85
``` console
86
- > git switch develop
87
86
> git fetch upstream
87
+ > git switch develop
88
88
> git merge upstream/develop
89
89
> git push origin develop
90
90
```
@@ -181,8 +181,8 @@ It is a lot easier to resolve conflicts at this stage.
181
181
Synchronize your repository:
182
182
183
183
``` console
184
- > git switch develop
185
184
> git fetch upstream
185
+ > git switch develop
186
186
> git merge upstream/develop
187
187
> git push origin develop
188
188
```
@@ -253,8 +253,8 @@ do the following:
253
253
Synchronize your repository:
254
254
255
255
``` console
256
- > git switch develop
257
256
> git fetch upstream
257
+ > git switch develop
258
258
> git merge upstream/develop
259
259
> git push origin develop
260
260
```
@@ -298,8 +298,8 @@ Copy the IDs of any commits you made that you want to keep:
298
298
Update your ` 4.3 ` branch:
299
299
300
300
``` console
301
- > git switch 4.3
302
301
> git fetch upstream
302
+ > git switch 4.3
303
303
> git merge upstream/4.3
304
304
> git push origin 4.3
305
305
```
You can’t perform that action at this time.
0 commit comments