@@ -312,7 +312,7 @@ while. In the meantime, ``main`` has progressed from commit E to commit (say) G:
312
312
D---E---F---G main
313
313
314
314
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
316
316
history will get messy. Most of the time you can just ask for a review, and not
317
317
worry that ``main `` has got a little ahead. But sometimes, the changes in
318
318
``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
399
399
taste).
400
400
401
401
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 ::
403
403
404
404
$ git push --force-with-lease
405
405
406
406
which tells git you are aware of the risks and want to do the push anyway. We
407
407
recommend using ``--force-with-lease `` over the ``--force `` flag. The
408
408
``--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
410
410
thought it was.
411
411
412
412
Be judicious with force-pushing. It is effectively re-writing published
0 commit comments