From: Junio C Hamano <junkio@cox.net>
Date: Fri, 17 Mar 2006 04:16:14 GMT
Subject: Re: git-cvsimport "you may need to merge manually"
Message-ID: <7vfylh7lkh.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <86fylh20x6.fsf@blue.stonehenge.com>

merlyn@stonehenge.com (Randal L. Schwartz) writes:

> Yeah, this doesn't make sense.  It used to "Just Work".  I can
> certainly add "git reset --hard" to my workflow, if that's the real
> work around.  And if so, the manpage should document that.

That should _not_ be the solution.

I think the behaviour we are seeing does not make much sense.
I'll take a deeper look at it tonight (or tomorrow if I am
unlucky), if nobody beats me to it.

Sorry about the breakage.