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

Submodules and merge conflicts

From
Henk <henk_westhuis@hotmail.com>
Date
May 21, 2009, 13:22 UTC
Message-ID
<1242912120853-2951928.post@n2.nabble.com>
We have a git repository with 2 submodules structured like this:
-Root
 -Src
    -Scripts [Submodule]
    -Kernel [Submodule]
    -Web

When someone makes changes in the Kernel submodule, the sha1 of the submodule changes. This means that the repository that uses this submodule also changes because the link to the submodule changes. This very often causes confusion. Co-workers very often get merge-conflicts on the submodule sha1 which are annoying and confusing.

The reason we like using submodules instead of having one larger repository is that there are seperate teams working on each module. We also use other version numbers voor the kernel and the appllications using the kernel.

Instead of using the sha1 of a specific revision in the submodule, I would find it more logical to use a branch-name or tag. This way you can commit on the submodule without having to commit the new submodule revision to the main repository also.

I would like to hear your thoughts on this. Maybe we are using submodules wrong, or maybe this is already possible.

Henk Westhuis
-- 
View this message in context: http://n2.nabble.com/Submodules-and-merge-conflicts-tp2951928p2951928.html
Sent from the git mailing list archive at Nabble.com.
Next: Avery Pennarun
Message 1 of 2 in “Submodules and merge conflicts”
  1. HenkMay 21, 2009
  2. Avery PennarunMay 21, 2009

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.