git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: git-cvsimport "you may need to merge manually"

From
Junio C Hamano <junkio@cox.net>
Date
Mar 17, 2006, 08:08 UTC
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.

Previous: smurf@smurf.noris.deNext: smurf@smurf.noris.de
Message 11 of 13 in “git-cvsimport "you may need to merge manually"”
  1. Randal L. SchwartzMar 17, 2006
  2. Junio C HamanoMar 17, 2006
  3. Randal L. SchwartzMar 17, 2006
  4. Randal L. SchwartzMar 17, 2006
  5. Junio C HamanoMar 17, 2006
  6. Randal L. SchwartzMar 17, 2006
  7. Junio C HamanoMar 17, 2006
  8. Randal L. SchwartzMar 17, 2006
  9. Junio C HamanoMar 18, 2006
  10. smurf@smurf.noris.deMar 17, 2006
  11. Junio C HamanoMar 17, 2006
  12. smurf@smurf.noris.deMar 17, 2006
  13. Junio C HamanoMar 17, 2006

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.