jefftriplett / www-the-mason-jar

A front-end to the primary repo.

The Mason Jar Project

Powered by DocPad

A static front-end to the primary recipe repo. If you're looking at this and want to submit your own cocktails or infusions, go there.

To build the site to pull in new changes in the primary recipe repo:

1. Commit any changes to the primary repo and push them up to Github
2. Go into the primary recipe repo submodule directory cd src/documents/the-mason-jar
3. Pull primary recipes repo git pull origin master
4. Run git submodule update
5. Head back up to the root directory cd ../../../
6. Run docpad build or, if that doesn't work docpad run
7. Add and commit the changes git add then git commit -am
8. Push to Github git push origin master
9. Push to Heroku git push heroku master

How to handle a tricky merge:

1. The "out" folder will usually have conflicts you'll need to merge manually
2. Take care of any conflicts in the /src folder
3. Run docpad build or, if that doesn't work docpad run
4. Add and commit the changes git add then git commit -am
5. Should be good to go