Hi Andrew, Thanks for your response!
I tried that but received the following error: fatal: git checkout: updating paths is incompatible with switching branches. Did you intend to checkout 'origin/add_projects' which can not be resolved as commit? Even if it had worked, wouldn't all the add_projects stuff still have been in master? Thanks, Ken On Aug 26, 1:08 pm, Andrew Turner <[email protected]> wrote: > 2009/8/26 Ken <[email protected]>: > > > > > Hello, > > > I have a local git repository with two branches - master and > > add_projects. Periodically I push the changes to github. This all > > works well. > > > Today I decided to sync everything up with another machine. I logged > > into the second machine, which has only one branch (master), and did a > > "git pull origin master". That worked fine. Then I did a "git pull > > origin add_projects" thinking that it would create the add_projects > > branch on the local machine. It didn't. Instead it put all the > > add_projects changes into the master branch. Is there some way I can > > get out of this mess? Also, how should I have done this? > > > I could really use some help! > > > Thanks, Ken > > Try:- > > git checkout -b add_projects origin/add_projects > > Cheers, > Andrew --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "GitHub" 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/github?hl=en -~----------~----~----~----~------~----~------~--~---
