Re: Now What?

From: Peter Eriksen <s022018@student.dtu.dk>
Date: Nov 3, 2005, 17:30 UTC
Message-ID: <20051103173012.GA21428@bohr.gbar.dtu.dk>
In-Reply-To: <Pine.LNX.4.64.0511031151070.25300@iabervon.org>

On Thu, Nov 03, 2005 at 12:05:42PM -0500, Daniel Barkalow wrote:

Show 21 quoted lines

> 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).

I really should have stated that from the beginning. Yes, I forgot, I had checked out some other branch and thought (the first I times assumed) that it would merge into master. So it's really just an accident, which I would think, is not that uncommon for newcommers.

Peter