On 1/10/13 1:48 PM, Johnf wrote: > I did git remote update > Is that incorrect?
Yes. I'm not sure what the 'update' argument to 'git remote' does (can't find it in the docs but when I run it I see it says "fetching origin") but the commands you want to pull changes from dabo's working to your working are: git checkout working ## if you aren't already on that branch git pull The first changes HEAD to point to the tip of your local 'working' branch. The second is actually two git commands rolled into one: git fetch git merge ## (merge commits from origin/working with your local working) If you don't have local changes you eventually want to commit on your local branch, git pull is just fine. Otherwise I like 'git fetch; git rebase' because it'll (try to) cleanly apply the commits you fetched to your branch instead of resulting in a commit on your local branch for the merge. You should google 'git tutorial' and read up. It doesn't take too long to get up to speed although some of the commands do seem needlessly arcane at least at first. Paul _______________________________________________ Post Messages to: [email protected] Subscription Maintenance: http://mail.leafe.com/mailman/listinfo/dabo-users Searchable Archives: http://leafe.com/archives/search/dabo-users This message: http://leafe.com/archives/byMID/[email protected]
