I was looking for a way to track a local branch to a remote repository. I came across this great plugin: http://github.com/webmat/git_remote_branch
From: http://www.mail-archive.com/heroku@googlegroups.com/msg00350.html
Can I get suggestions on how to move my app from GitHub to Heroku and back?
You can do this if you’re using git locally. The magic of
decentralized revision control makes it possible, since every checkout
is a full repository in its own right. What I suggest is adding two
different remotes to your local checkout, and then you can push to
both. Something like this:
git remote add github [EMAIL PROTECTED]:myaccount/myapp.git
git remote add heroku [EMAIL PROTECTED]:myapp.git
Then you can do “git push heroku” and “git push github”, or pull, or
diff, or whatever. You could also name one origin, which will make it
the default, but it would probably lead to less confusion if you had
to explicitly name where you wanted to push or pull from each time.
In my specific case, I am already hosting my codebase on Github. I want to keep the main repository there because I like all of the available features. I also want to be able to work with collaborators and allow them to make commits to the master Github repository.
Heroku is amazing, but when you push to the Heroku repository it automatically restarts the application. Using these methods, I can maintain a situation where one person is able to manage what actually goes “live” to Heroku, while everyone else can work away on Github using the normal collaboration procedures.
Result, the best of both worlds!
I know I am late to the party, as usual, nut after finding out about the great hosting option known as Heroku, it has become a necessity.
My one drawback is that I love my svn gui SmartSVN. It turns out that there is a built in GUI called git gui…. read here: http://pillowfactory.org/2008/09/11/git-awareness-week-git-gui/ for more info.
Other Resources:
So here we go with the process today. I found that this blog post http://blog.viarails.net/2008/4/4/how-to-convert-your-svn-repo-to-git was flawless in execution and I highly recommend it. So far I have been able to complete the transfer and upload the new git repository.
I would like to argue that SVN is not passé – or out of style – in fact when you are working with a small team of developers, or even by yourself, I think that the remote server concept is actually quite beneficial. I understand the whole branch / merge concept, and think it is fantastic, but I see value in all both approaches. Just my 2 cents.