[git-users] Merging to a branch without checking it out

2010-03-20 Thread Ted
This is an attempt at a continuation of an earlier thread: http://groups.google.com/group/git-users/browse_thread/thread/74460270aaa2bfb2 I would have replied to that thread but I didn't see an option to, maybe because I'm a new member. I'm using git to keep track of various scripts and configura

[git-users] Merging to a branch without checking it out

2009-03-26 Thread François Montel
Some advice needed on the best way to go about the following scenario: I have a branch "master" which my production site runs on (in this case, using git for a web app). I have a branch "testing" where I create new features and which my development site runs on. Both of these branches reside in