diff --git a/README.md b/README.md
index d40392e1..8387119b 100644
--- a/README.md
+++ b/README.md
@@ -11,3 +11,6 @@ git push
 
 To save your login credentials locally use:
 git config --global credential.helper store
+
+If conflict occurs use:
+git config pull.rebase false