get changes to generate.sh from master

1 files changed, 17 insertions, 0 deletions

diff --git a/generate.sh b/generate.sh
index 32eacfa..9d5fb87 100755
--- a/generate.sh
+++ b/generate.sh
@@ -3,6 +3,23 @@
 # The generate.sh bash file is used to generate all of the necessary
 # .rb files to run the website
 
+# To modify it and update the app do the following:
+#  1. Take care of uncommitted files
+#  2. Run `git checkout clean2`
+#  3. Run `git pull`
+#  4. Make any changes to `generate.sh`, and commit them.
+#     If you have committed the desired changes to 'master', you can do
+#     this simply with:
+#         git checkout master generate.sh
+#         git commit -m 'Get changes to generate.sh from master
+#  5. Run `./generate.sh`
+#  6. Run `git commit -m 'run ./generate.sh'`
+#  7. Run `git checkout master`
+#  8. Run `git merge clean2`
+#  9. Resolve any merge conflicts.
+# 10. Run `git push origin clean2`
+# 11. Run `git push origin master`
+
 set -xe
 
 # figure out where we are running from