Make updating instructions handle changes made

docs/common_ops.rst

@@ -7,7 +7,9 @@ In this case, the update process should be fairly straightforward.
 Turn on QT, open a terminal, go to the :code:`abm-setup` directory, and pull the updates::
 
     cd ~/abm-setup
+    git stash save
     git pull
+    git stash pop
 
 Then start the interaction as specified in the setup.
 The container rebuild and the updates will be applied.
@@ -53,4 +55,4 @@ Now we can delete the files that save the state of the interaction and user inte
 
 Now start the interaction as per the setup instructions and QT is ready to begin with a new participant.
 
-Note that, QT will look at the last seven days of Fitbit activity with the associated Fitbit device in setting the first week's steps goal, so if you want to go straight to a new participant, maybe you should use a different Fitbit account.
+Note that, QT will look at the last seven days of Fitbit activity with the associated Fitbit device in setting the first week's steps goal, so if you want to go straight to a new participant, maybe you should use a different Fitbit account.