From 9dafe52a637472f79173829824392229ee1d424e Mon Sep 17 00:00:00 2001 From: Nicolas Dermine Date: Sun, 19 Nov 2017 18:56:42 +0100 Subject: [PATCH] fix typo (#141) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c71736d..71f8366 100644 --- a/README.md +++ b/README.md @@ -195,7 +195,7 @@ Note that, as with rebasing (see below), amending **replaces the old commit with (my-branch)$ git push origin mybranch --force-with-lease ``` -In general, **avoid force pushing**. It is best to create and push a new commit rather than force-pushing the amended commit as it has will cause conflicts in the source history for any other developer who has interacted with the branch in question or any child branches. `--force-with-lease` will still fail, if someone else was also working on the same branch as you, and your push would overwrite those changes. +In general, **avoid force pushing**. It is best to create and push a new commit rather than force-pushing the amended commit as it will cause conflicts in the source history for any other developer who has interacted with the branch in question or any child branches. `--force-with-lease` will still fail, if someone else was also working on the same branch as you, and your push would overwrite those changes. If you are *absolutely* sure that nobody is working on the same branch or you want to update the tip of the branch *unconditionally*, you can use `--force` (`-f`), but this should be avoided in general.