Hi Ben -
At Carleton - it remains an open question how we are going to handle a
full git workflow. We currently update the code on our production web
server by doing an svn update (which pulls the latest code that we've
tested on a staging server). I use git svn to maintain a branch of our
production svn code in git, which I rebase and merge into the
reason_package master branch at github. We want to move to a full git
workflow but are trying to figure out the best approach.
Perhaps in July we should aim to have a session or workshop on Git. If
you guys have come up with something that works well, others could
certainly benefit from your experience. We may also be further along
with our git strategy at Carleton by then.
My current thinking is that we should do something like this:
1. Locally, create a git repo that contains everything
(reason_package, the web tree, etc).
2. Clone reason_package @ github and add it as a submodule in our uber
repo described in #1.
My understanding of git submodules is rather limited, but I think with
the above, somebody locally could clone the whole thing locally with
git clone --recursive git://local/path/to/uber/repo.git
I think that in this world, you could have a deployment command on
your staging server that would ssh to the production server, and just
do a git pull to update a branch of the uber repo that represented the
production instance of the web site. You could presumably test using
that same branch on a staging server.
With submodules, you would have to treat work in reason_package itself
a little differently. Specifically, you'd have to commit changes in
the reason_package subfolder, and then go outside that folder to
commit the state of the submodule, but that doesn't seem so hard to
do. It also makes it very easy to pull changes from master or a
certain version and merge them into a reason_package_carleton branch
or something. All this said, I read about people having problems with
submodules and I remain too much of a git newbie to really know if
what I'm talking about makes sense. I hope to do some experimentation
soon to see how this all works.
Not sure this is helpful - would love to hear others thoughts on
managing core and local code with git, and deployment strategies.
On Apr 23, 2:41 pm, wilbbe01 <wilb...@wilburweb.com> wrote: