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

How to handle confilicts when merging submodules in the process of rebase

From
Ping Yin <pkufranky@gmail.com>
Date
Jan 13, 2008, 06:54 UTC
Message-ID
<46dff0320801122254u85dde52ra68ffc3abbf62bda@mail.gmail.com>

In such a case, the blob sha1 for the conflicting submodule in working tree and 3 stages of index may be different from each other. So git add will not work if I want to use stage 1 or stage 2 as the merging result. Then how?

-- 
Ping Yin
Message 1 of 1 in “How to handle confilicts when merging submodules in the process of rebase”
  1. Ping YinJan 13, 2008

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.