Your remote server should already be getting the branch information for "localcopy".
Run git fetch git branch -a on the remote server. FYI, "git fetch" is automatically run during a "git pull" so if you've run a pull since you've pushed your localcopy branch up, it should already be there as origin/localcopy. If you don't see that, send me the output from the "git branch -a" command on the remote server and also the output of "git config -l" on both the remote server and your local repository. If it's there like it should be, you will want to create a branch on the remote server that tracks origin/localcopy: git branch --track localcopy origin/localcopy git checkout localcopy At this point, running "git pull" on the remote server will get the updates you've pushed to localcopy. Long On Tue, Jun 10, 2008 at 5:39 PM, Antony Evans <[EMAIL PROTECTED]> wrote: > > Long, > > It's mostly working now, thank you, however I have run into a small > problem driven I think by my many branches. Perhaps you can give me > some advice on how to best manage my branches. > > I am making my changes on local copy, and reserving master for pulling > down changes when you make them. This means I have two branches on my > github account, which are called origin/localcopy and origin/master > (when viewed remotely). Master contains your files, whereas localcopy > contains my edits. > > When I pull from Github to my deployment machine, as you previously > suggested, it clones the master branch but this doesn't have my > changes in it. > > I see two options: > 1. Merge my changes to localcopy back into the Master and then push/ > pulling the master to my remote server > 2. Getting the remote server to pull down the localcopy branch. > > The second option seems preferable to me because then I can make sure > I don't get problems when adding in the updates, however I don't know > how to get my remote server to download the localcopy. I also read in > your guides that pushing all my edits onto my local Master copy is > best practices, but what happens then if there is a conflict when you > update the core project files? > > An unrelated question, but one I've been pondering, is what happens if > you make changes to the database in a update. How do we know that we > need to rerun the migrations? > > Antony > > > -- Long Nguyen [EMAIL PROTECTED] --~--~---------~--~----~------------~-------~--~----~ Insoshi developer site: http://dogfood.insoshi.com/ Insoshi documentation: http://docs.insoshi.com/ You received this message because you are subscribed to the Google Groups "Insoshi" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/insoshi?hl=en -~----------~----~----~----~------~----~------~--~---
