Update readme with troubleshooting section. Somewhat fixes #3

bstream · Feb 25, 2016 · 0ecd1b9 · 0ecd1b9
1 parent a8d2872
commit 0ecd1b9
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -3,4 +3,16 @@ dots
 
 My dot-files (.bash_profile etc.)
 
-Install with ```./install.sh```
+Install with ```./install.sh```
+
+
+### Troubleshooting
+If you run update and get a merge conflict for dots, you can reset your installation by running these commands in the dots-repo:
+```sh
+# fetch from the default remote, origin
+git fetch
+# reset your current branch (master) to origin's master
+git reset --hard origin/master
+# Reinstall dots
+./install.sh
+```