-
Notifications
You must be signed in to change notification settings - Fork 27
Hacking on webchurch
ngoodman edited this page Sep 24, 2013
·
2 revisions
Currently, webchurch
is included as a submodule within chapters
.
I made the decision to use submodules because it seems like webchurch
and chapters
should only be loosely coupled (e.g., we might very well want to spin webchurch into a desktop application). An unfortunate consequence of this is that simultaneously developing webchurch
and chapters
is slightly complicated.
If you want to hack on webchurch
and have those changes reflected in chapters
, here is a way that I'm pretty sure works:
- In a separate git repo of
webchurch
, commit changes, and push to github - In the
webchurch
submodule insidechapters
, dogit pull
(you will first have to be on a branch: dogit checkout master
) - In
chapters
superproject that contains the submodule, commit the fact that you updated the submodule (with a message like "update webchurch") - Run deploy.sh to push changes to github and linode
There are certainly other ways we could have set this up, but my git-fu isn't strong, so I don't yet know if they have any drawbacks. This 4-step process appears to work.