From: Junio C Hamano <junkio@cox.net>
To: smurf@smurf.noris.de
Cc: git@vger.kernel.org
Subject: Re: git-cvsimport "you may need to merge manually"
Date: Fri, 17 Mar 2006 00:08:20 -0800 [thread overview]
Message-ID: <7vfylh1ojv.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <20060317072602.GH14562@smurf.noris.de> (smurf@smurf.noris.de's message of "Fri, 17 Mar 2006 08:26:02 +0100")
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.
next prev parent reply other threads:[~2006-03-17 8:08 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-03-17 2:37 git-cvsimport "you may need to merge manually" Randal L. Schwartz
2006-03-17 2:43 ` Junio C Hamano
2006-03-17 2:57 ` Randal L. Schwartz
2006-03-17 3:04 ` Randal L. Schwartz
2006-03-17 3:23 ` Junio C Hamano
2006-03-17 3:41 ` Randal L. Schwartz
2006-03-17 4:16 ` Junio C Hamano
2006-03-17 4:19 ` Randal L. Schwartz
2006-03-18 23:21 ` Junio C Hamano
2006-03-17 7:26 ` smurf
2006-03-17 8:08 ` Junio C Hamano [this message]
2006-03-17 6:46 ` smurf
2006-03-17 8:06 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vfylh1ojv.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
--cc=smurf@smurf.noris.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox