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

Bug Report: Submodule conflict error message

From
JPJuan Palacios <jpalacios@atlassian.com>
Date
Oct 24, 2014, 02:46 UTC
Message-ID
<CABY2JrJBgFDP-gKWUR438PiuB+g0g2wrD9Hoa-fkfCUyUaGp6w@mail.gmail.com>

In a project with a submodule, if you merge two diverging branches in which one branch updated which commit the submodule points to, and the other branch moves the submodule to a new location, the resulting merge error message does not provide information about what the conflict was, or the path to the conflicted directory.

I've attached a short script which sets up a project with a submodule and creates both branches. If after running it you cd into 'top-level-project' and run 'git merge branch_that_points_the_submodule_to_new_commit' the resulting error message is:

Auto-merging submodule-moved Adding as submodule-moved~HEAD instead Automatic merge failed; fix conflicts and then commit the result.

I would have expected an output in line with other merge conflict messages. Something with the format:

CONFLICT (<REASON>): Merge conflict in <PATH_TO_CONFLICT>

Where <REASON> would be something like (delete/modify) I believe this might be a bug in the implementation.

Thank you
Message 1 of 1 in “Bug Report: Submodule conflict error message”
  1. Juan PalaciosOct 24, 2014

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.