On Wed, Jul 22, 2009 at 2:41 PM, Dr. Jennifer Nussbaum<bg271828@xxxxxxxxx> wrote: > > Hi, > > I hope its OK to ask basic questions on this list. > > Im a recent convert to git and having trouble with branches. I mostly work on projects by myself, and what I want is that all branches of everything Im doing are in sync everywhere. > > I have a remote repository on my production server that serves as the "main" repository. Then i work on projects on a number of different computers--my main home computer, my main work machine, several non-main computers :-) ... > > I've found it very confusing dealing with branches in this environment. If I have my "master" branch, and decide that i want a "refactoring-templates" branch, what Id *like* to do is create that branch, work on it, commit it, and when I say "git push" I want everything that's new on that computer to be synced to the "main" repository. And then when I get to the next computer, I want to be able to say "git pull" and have everything on that computer by synced *from* the "main" repository. > > Instead I get confused by having to push branches separately, and it's confusing that when I do a pull it doesnt necessarily get other branches unless I specify them directly, and so on. > > I've looked at the docs on branches and there's something i guess Im missing because this still seems very difficult. Can someone giving me advice on the best way to keep this kind of thing organized? > > Thanks! > > Jen I was turned off about this at first when I used git - I was in SVN mode still and wanted all my local branches to be synchronized with the remote repository. A year and a half later, I'm glad that the minds behind git didn't set out to make git like SVN! I really think this was the right decision. For instance... if you pulled ALL of your branches in one command... what if there were conflicts? I doubt you'd want to resolve them right then and there. Anyways... 'git fetch' will download all the changes from the remote repository. From there, you can simply merge any remote branch locally (ie, 'git merge origin/master' while in the master branch). Enjoy the journey! Tim -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html