* run `git pull`
* run `git push`
-# what to do if "git pull" results in conflict
+# Troubleshooting
+## [[!toggle id="conflict" text="""what to do if "git pull" results in conflict"""]]
-# what to do if you want to add files.
+[[!toggleable id="conflict" text="""
+* to be done
+* if you are still unsure what to do please ask for advice on IRC or the
+mailing list
+[[!toggle id="conflict" text="hide"]]
+"""]]
+
+## [[!toggle id="add" text="""what to do if you want to add files."""]]
+
+[[!toggleable id="add" text="""
+* to be done
+* if you are still unsure what to do please ask for advice on IRC or the
+mailing list
+
+[[!toggle id="add" text="hide"]]
+"""]]
---
this one, `git status` is very important, to check files that should have