On Thu, 3 Nov 2005, Junio C Hamano wrote: > "Peter Eriksen" <s022018@student.dtu.dk> writes: > > > Here's one I've done too many times: > > > > ~/git/git-core]cat .git/remotes/origin > > URL: git://git.kernel.org/pub/scm/git/git.git > > Pull: master:origin > > > > ~/git/git-core]git-checkout maint > > ~/git/git-core]git pull > > You are merging my master into your "maint", probably a copy of > my (previous) maint. I think the situation is that he really wanted to update master, but forgot that he was on the maint branch. So now he's in a merge of things he didn't actually want to merge and wants to get back to not having junk all over the place (some files that need to be merged, some files that have been merged, new files, removed files, etc). -Daniel *This .sig left intentionally blank* - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Fri Nov 04 04:09:03 2005
This archive was generated by hypermail 2.1.8 : 2005-11-04 04:09:07 EST