From: Junio C Hamano <junkio@cox.net>
Date: Fri, 17 Mar 2006 08:08:20 GMT
Subject: Re: git-cvsimport "you may need to merge manually"
Message-ID: <7vfylh1ojv.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20060317072602.GH14562@smurf.noris.de>

smurf@smurf.noris.de writes:

> The real workaround is not to import into live branches,
> which is not a git-cvs-specific problem, so I didn't add that
> to its manpage.

Yes.  I sufferred the same problem when I did git-fetch/git-pull,
and there is a clever/ugly workaround for that.