We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent 21e456d commit d3cad77Copy full SHA for d3cad77
src/doc/en/developer/workflows.rst
@@ -152,18 +152,13 @@ It commonly happens that ``develop`` branch at the remote ``upstream`` was
152
updated and you need to merge the upstream changes to your local branch. Then
153
you do::
154
155
- [alice@localhost sage]$ git checkout develop
156
- ....
157
- [alice@localhost sage]$ git pull upstream
158
+ [alice@localhost sage]$ git fetch upstream develop:develop
159
160
This fast-forwards your local ``develop`` branch to the upstream
161
``develop`` branch.
162
163
Now you go back to your working branch and merge the updated ``develop`` branch::
164
165
- [alice@localhost sage]$ git checkout last_twin_prime
166
167
[alice@localhost sage]$ git merge develop
168
....
169
0 commit comments