Skip to content

Commit d3cad77

Browse files
committed
Use git fetch upstream develop:develop to update local develop branch
1 parent 21e456d commit d3cad77

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

src/doc/en/developer/workflows.rst

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -152,18 +152,13 @@ It commonly happens that ``develop`` branch at the remote ``upstream`` was
152152
updated and you need to merge the upstream changes to your local branch. Then
153153
you do::
154154

155-
[alice@localhost sage]$ git checkout develop
156-
....
157-
[alice@localhost sage]$ git pull upstream
158-
....
155+
[alice@localhost sage]$ git fetch upstream develop:develop
159156

160157
This fast-forwards your local ``develop`` branch to the upstream
161158
``develop`` branch.
162159

163160
Now you go back to your working branch and merge the updated ``develop`` branch::
164161

165-
[alice@localhost sage]$ git checkout last_twin_prime
166-
....
167162
[alice@localhost sage]$ git merge develop
168163
....
169164

0 commit comments

Comments
 (0)