diff --git a/README.md b/README.md index d61035c..04a7dac 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ For clarity's sake all examples in this document use customized bash prompt in o Note that, as with rebasing (see below), amending **replaces the old commit with a new one**, so you must force push (`-f`) your changes if you have already pushed the pre-amended commit to your remote. Be careful when you do this – *always* make sure you specify a branch! -In fact, if you are not the only developer using the repo **avoid force pushing**. It is best to create and push a new commit rather than force-pushing the amended commit as it has the potential to mess with the shared history. +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. ## I need to combine commits