Hi Avery, Ahh, thanks so much for taking the time to sort me out - that's helped immeasurably to fill the gaps. I actually feel like I'm starting to understand the basics now! I suspect my svn background has hindered more than helped.
So, "git push michaeltyson master" was reporting that everything was up to date because there was in fact a local 'master' branch that was indeed no newer - I was working on the branch called "michaeltyson/ master" (I blame the suggestion at http://snipplr.com/view/16263/switch-to-a-remote-github-branch-or-fork/ for that naming blunder ;-) ) "git push michaeltyson" worked for, admittedly (in light of your reply) no reason I can see - the remote branch is just 'master', not 'michaeltyson/master'. Shrug! > > An aside - despite being on the 'michaeltyson/master' branch, which I > > assume is the remote branch pointing at my fork on github, > > git branches do not "point at" other branches. And you can't be "on" > a remote branch; you can only be on a local branch. So you're having > severe misunderstanding problems here. > I beg your pardon; I originally surmised that remote tracking branches were local branches that were linked to a remote branch (i.e. could be checked out, and contained information about the remote repository). They're not =) > Re-read Scott Chacon's email from earlier. The problem is you have a > *local* branch called "michaeltyson/master". It is *not* a remote > branch and has *nothing to do* with a remote branch. It should just > be called "master". To fix it, do this: > > git branch -D master > git branch -m michaeltyson/master master > > Now your original push command will work: Ah yes - this misunderstanding came from my incorrect assumption about remote tracking branches (how I wish they were just consistently called "remotes", without those confusing "branch" connotations) > If you're going to ask people for advice, you'd be better off actually > following their advice rather than ignoring it :) Scott was right. > Fix it and your problems should go away. He was indeed right, but I was missing a few crucial details that were stopping me from being able to execute his suggestions - I had no intention of slighting his reply! Now I'm sorted ;-) Cheers, Michael -- 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.
