Update how_to_use_git.md

documentation/how_to_use_git.md

@@ -96,6 +96,23 @@ git push origin master
 
 If all succeeds, you should be able to see your commit on Gitlab.
 
+#### WTF? I have to remember all of that?
+That was the exhaustive list to cover all of the worst case scenarios. Typically
+things go much smoother:
+```
+git pull origin master                 # get most recent stuff from Gitlab
+# make some changes
+git add .                              # stage files to be committed
+git commit -m "change something"       # commit the staged files
+# make some more changes
+git add .                              # stage files to be committed
+git commit -m "change something else"  # commit the staged files
+git pull origin master                 # pre-emptively merge Gitlab's master into mine
+git push origin master                 # sync my 2 commits to Gitlab's master
+```
+It really isn't that bad once you use it for a week. Just don't panic when you
+get your first merge conflicts 😉
+
 ## Other workflows
 What we just described is the bare minimum Git workflow. Most people don't like
 working this way. We encourage you to research other workflows, like a Git