You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: contributing/documentation/overview.rst
+3-28Lines changed: 3 additions & 28 deletions
Original file line number
Diff line number
Diff line change
@@ -136,38 +136,13 @@ even remove any content and do your best to comply with the
136
136
137
137
**Step 6.** **Push** the changes to your forked repository:
138
138
139
-
Rebase your branch
140
-
~~~~~~~~~~~~~~~~~~
139
+
Before submitting your PR, you may have to update your branch as described in :doc:`the code contribution guide </contributing/code/pull_requests#rebase-your-pull-request>`.
141
140
142
-
Before submitting your PR, update your branch (needed if it takes you a
143
-
while to finish your changes):
141
+
Then, you can push your changes:
144
142
145
143
.. code-block:: terminal
146
144
147
-
$ git checkout 6.x
148
-
$ git fetch upstream
149
-
$ git merge upstream/6.x
150
-
$ git checkout improve_install_article
151
-
$ git rebase 6.x
152
-
153
-
.. tip::
154
-
155
-
Replace ``6.x`` with the branch you selected previously (e.g. ``5.4``).
156
-
157
-
When doing the ``rebase`` command, you might have to fix merge conflicts.
158
-
``git status`` will show you the *unmerged* files. Resolve all the conflicts,
159
-
then continue the rebase:
160
-
161
-
.. code-block:: terminal
162
-
163
-
$ git add ... # add resolved files
164
-
$ git rebase --continue
165
-
166
-
Make sure that the docs still build correctly and push your branch remotely:
167
-
168
-
.. code-block:: terminal
169
-
170
-
$ git push --force origin improve_install_article
145
+
$ git push origin improve_install_article
171
146
172
147
The ``origin`` value is the name of the Git remote that corresponds to your
173
148
forked repository and ``improve_install_article`` is the name of the branch you
0 commit comments