File tree Expand file tree Collapse file tree 1 file changed +5
-5
lines changed
book/03-git-branching/sections Expand file tree Collapse file tree 1 file changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -152,7 +152,7 @@ This makes the renamed branch available on the remote.
152
152
$ git push --set-upstream origin main
153
153
----
154
154
155
- Now we end up with the following state of the repository :
155
+ Now we end up with the following state: :
156
156
157
157
[source,console]
158
158
----
@@ -163,10 +163,10 @@ git branch --all
163
163
remotes/origin/master
164
164
----
165
165
166
- Your local _master_ branch is replace with the _main_ branch.
167
- Your _main_ branch is also available on the remote.
168
- The remote still has a _master_ branch.
169
- Other collaborators will continue to use the _master_ branch until you make some further changes.
166
+ Your local _master_ branch is gone, as it's replaced with the _main_ branch.
167
+ The _main_ branch is also available on the remote.
168
+ But the remote still has a _master_ branch.
169
+ Other collaborators will continue to use the _master_ branch as the base of their work, until you make some further changes.
170
170
171
171
Now you have a few more tasks in front of you to complete the transition:
172
172
* Project dependency update helper configuration files.
You can’t perform that action at this time.
0 commit comments