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

How are submodule conflicts resolved during rebase?

From
RDRobert Dailey <rcdailey.lists@gmail.com>
Date
Apr 28, 2015, 14:34 UTC
Message-ID
<CAHd499CSshO-929PF7fiR4hpxd9J=S+XFuE3sdQHFjPvXT_C0w@mail.gmail.com>
Hey guys,

I'm using Git for Windows 2.3.6. There is a bit of confusion I have with regards to how submodule conflicts are resolved/handled during a rebase.

Suppose I have a branch with 10 commits on it, 3 of those commits contain a change to the same (and only) submodule in the repository. When I rebase this branch onto the tip of its parent branch, I get a conflict in each of the 3 commits because the submodule also changed on the parent branch since my last rebase.

I've seen some cases where I am asked to resolve the submodule conflict with local or remote. I expect this behavior and it isn't confusing to me. However, I have also seen cases where rebase auto resolves the conflicted submodule.

How does Git know to auto resolve some submodule conflicts but not the others? I find this behavior unpredictable and I haven't found any documentation on it (I'm giving the git docs the benefit of the doubt and assuming it's there, since the git docs are very very good).

Help is appreciated. Thank you.
Next: Robert Dailey
Message 1 of 5 in “How are submodule conflicts resolved during rebase?”
  1. Robert DaileyApr 28, 2015
  2. Robert DaileyApr 28, 2015
  3. Heiko VoigtApr 28, 2015
  4. Robert DaileyApr 28, 2015
  5. Heiko VoigtApr 28, 2015

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.