From 53c209dd99d4789da93a3423ba5f130c5eca1c5c Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Wed, 23 Apr 2014 15:07:45 -0400 Subject: updated generate with instructions --- generate.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/generate.sh b/generate.sh index 5b77ed1..7c8f8af 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. `git checkout clean2` +# 3. `git pull` +# 4. `git checkout master generate.sh` +# 5. `git commit -m 'get changes to generate.sh from master` +# ./generate.sh +# *6. `./generate.sh` +# 7. `git commit -m 'run ./generate.sh'` +# 8. `git checkout master` +# 9. `git merge clean2` +# 10. resolve any merge conflicts +# 11. git push origin clean2 +# 12. `git push origin master` +# 13. ...? +# 14. Profit + set -xe # figure out where we are running from -- cgit v1.2.3-2-g168b