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

Re: [BUG] Replacing dir with submodule causes weird issues with cherry-pick

From
Johannes Sixt <j.sixt@viscovery.net>
Date
Feb 16, 2011, 07:05 UTC
Message-ID
<4D5B7744.7040409@viscovery.net>
In-Reply-To
<22F69B3E-600C-41AC-911D-B9808A3705E6@inkling.com>
Am 2/16/2011 0:19, schrieb Kevin Ballard:
> If I replace a directory in my project with a submodule, then later attempt to
> cherry-pick a commit that predates this change (but does not touch the directory),
> git always marks the submodule path as containing an created/deleted merge conflict.

Known breakage; t3030 tests for it. 7d82b06d talks about a file/directory conflict, though.

-- Hannes
Previous: Kevin Ballard
Message 2 of 2 in “[BUG] Replacing dir with submodule causes weird issues with cherry-pick”
  1. Kevin BallardFeb 15, 2011
  2. Johannes SixtFeb 16, 2011

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.