Skip to content

Commit dc3896d

Browse files
committed
docs: replace git checkout with git switch
1 parent cb0a0d4 commit dc3896d

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

contributing/workflow.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ Then synchronizing is done by pulling from us and pushing to you. This
7878
is normally done locally, so that you can resolve any merge conflicts.
7979
For instance, to synchronize **develop** branches:
8080

81-
git checkout develop
81+
git switch develop
8282
git fetch upstream
8383
git merge upstream/develop
8484
git push origin develop
@@ -109,8 +109,8 @@ For instance, make sure you are in the *develop* branch, and create a
109109
new feature branch, based on *develop*, for a new feature you are
110110
creating:
111111

112-
git checkout develop
113-
git checkout -b new/mind-reader
112+
git switch develop
113+
git switch -c new/mind-reader
114114

115115
Saving changes only updates your local working area.
116116

@@ -131,15 +131,15 @@ Just make sure that your commits in a feature branch are all related.
131131
If you are working on two features at a time, then you will want to
132132
switch between them to keep the contributions separate. For instance:
133133

134-
git checkout new/mind-reader
134+
git switch new/mind-reader
135135
// work away
136136
git add .
137137
git commit -S -m "Added adapter for abc"
138-
git checkout fix/issue-123
138+
git switch fix/issue-123
139139
// work away
140140
git add .
141141
git commit -S -m "Fixed problem in DEF\Something"
142-
git checkout develop
142+
git switch develop
143143

144144
The last checkout makes sure that you end up in your *develop* branch as
145145
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.
157157

158158
Synchronize your repository:
159159

160-
git checkout develop
160+
git switch develop
161161
git fetch upstream
162162
git merge upstream/develop
163163
git push origin develop
164164

165165
Bring your feature branch up to date:
166166

167-
git checkout new/mind-reader
167+
git switch new/mind-reader
168168
git rebase upstream/develop
169169

170170
And finally push your local branch to your GitHub repository:
@@ -223,14 +223,14 @@ do the following:
223223

224224
Synchronize your repository:
225225

226-
git checkout develop
226+
git switch develop
227227
git fetch upstream
228228
git merge upstream/develop
229229
git push origin develop
230230

231231
Bring your feature branch up to date:
232232

233-
git checkout new/mind-reader
233+
git switch new/mind-reader
234234
git rebase upstream/develop
235235

236236
You might get conflicts when you rebase. It is your

0 commit comments

Comments
 (0)