Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 446eff4

Browse filesBrowse files
tacaswelloscargus
andauthored
DOC: copy editing
Co-authored-by: Oscar Gustafsson <oscar.gustafsson@gmail.com>
1 parent 3079944 commit 446eff4
Copy full SHA for 446eff4

File tree

Expand file treeCollapse file tree

1 file changed

+3
-3
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+3
-3
lines changed

‎doc/devel/development_workflow.rst

Copy file name to clipboardExpand all lines: doc/devel/development_workflow.rst
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ while. In the meantime, ``main`` has progressed from commit E to commit (say) G:
312312
D---E---F---G main
313313
314314
At this stage you consider merging ``main`` into your feature branch, and you
315-
remember that this here page sternly advises you not to do that, because the
315+
remember that this page sternly advises you not to do that, because the
316316
history will get messy. Most of the time you can just ask for a review, and not
317317
worry that ``main`` has got a little ahead. But sometimes, the changes in
318318
``main`` might affect your changes, and you need to harmonize them. In this
@@ -399,14 +399,14 @@ correct course of action (or rebase your local branch but it is a matter of
399399
taste).
400400

401401
However, in the case of having intentionally re-written history we *want* to discard the commits and
402-
replace them with the new-and-improved versions from our local branch. In these cases what we want to do is ::
402+
replace them with the new-and-improved versions from our local branch. In these cases, what we want to do is ::
403403

404404
$ git push --force-with-lease
405405

406406
which tells git you are aware of the risks and want to do the push anyway. We
407407
recommend using ``--force-with-lease`` over the ``--force`` flag. The
408408
``--force`` will do the push no matter what, whereas ``--force-with-lease``
409-
will only do the push of the remote branch is where the local ``git`` client
409+
will only do the push if the remote branch is where the local ``git`` client
410410
thought it was.
411411

412412
Be judicious with force-pushing. It is effectively re-writing published

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.