@@ -78,7 +78,7 @@ Then synchronizing is done by pulling from us and pushing to you. This
78
78
is normally done locally, so that you can resolve any merge conflicts.
79
79
For instance, to synchronize ** develop** branches:
80
80
81
- git checkout develop
81
+ git switch develop
82
82
git fetch upstream
83
83
git merge upstream/develop
84
84
git push origin develop
@@ -109,8 +109,8 @@ For instance, make sure you are in the *develop* branch, and create a
109
109
new feature branch, based on * develop* , for a new feature you are
110
110
creating:
111
111
112
- git checkout develop
113
- git checkout -b new/mind-reader
112
+ git switch develop
113
+ git switch -c new/mind-reader
114
114
115
115
Saving changes only updates your local working area.
116
116
@@ -131,15 +131,15 @@ Just make sure that your commits in a feature branch are all related.
131
131
If you are working on two features at a time, then you will want to
132
132
switch between them to keep the contributions separate. For instance:
133
133
134
- git checkout new/mind-reader
134
+ git switch new/mind-reader
135
135
// work away
136
136
git add .
137
137
git commit -S -m "Added adapter for abc"
138
- git checkout fix/issue-123
138
+ git switch fix/issue-123
139
139
// work away
140
140
git add .
141
141
git commit -S -m "Fixed problem in DEF\Something"
142
- git checkout develop
142
+ git switch develop
143
143
144
144
The last checkout makes sure that you end up in your * develop* branch as
145
145
a starting point for your next session working with your repository.
@@ -157,14 +157,14 @@ It is a lot easier to resolve conflicts at this stage.
157
157
158
158
Synchronize your repository:
159
159
160
- git checkout develop
160
+ git switch develop
161
161
git fetch upstream
162
162
git merge upstream/develop
163
163
git push origin develop
164
164
165
165
Bring your feature branch up to date:
166
166
167
- git checkout new/mind-reader
167
+ git switch new/mind-reader
168
168
git rebase upstream/develop
169
169
170
170
And finally push your local branch to your GitHub repository:
@@ -223,14 +223,14 @@ do the following:
223
223
224
224
Synchronize your repository:
225
225
226
- git checkout develop
226
+ git switch develop
227
227
git fetch upstream
228
228
git merge upstream/develop
229
229
git push origin develop
230
230
231
231
Bring your feature branch up to date:
232
232
233
- git checkout new/mind-reader
233
+ git switch new/mind-reader
234
234
git rebase upstream/develop
235
235
236
236
You might get conflicts when you rebase. It is your
0 commit comments