Right you are.

I was referencing http://jk.gs/gittutorial.html but, as you say, was in the 
branch when I committed the merge, which then failed, and then I flailed 
around a bit.

thanks for the help, I didn't realize that you should be in the master when 
merging to master, I thought you should be in the branch you want to merge 
from -- had it backwards.

thanks agian,


You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To view this discussion on the web visit 
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
For more options, visit this group at 

Reply via email to