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

Re: different git-merge behavior with regard to submodules in 1.6.2.4 vs. 1.6.2.1

From
Finn Arne Gangstad <finnag@pvv.org>
Date
Apr 29, 2009, 12:15 UTC
Message-ID
<20090429121506.GA1266@pvv.org>
In-Reply-To
<20090429084209.GA24064@localhost>

On Wed, Apr 29, 2009 at 10:42:09AM +0200, Clemens Buchacher wrote: [...]

Show 11 quoted lines
> > git is unfortunately not capable of merging submodules at all, so I
> > added these error messages to give me a hint about what I needed to do
> > in conflicting submodules to get something useful. I have used git a
> > lot more now, so maybe it is time to pick this up again and implement
> > proper recursive sub-module merging.
> 
> Are you sure it's always the right thing to merge conflicting submodule
> versions? The user could easily commit two versions, which you would never
> want merge -- due to changed history, for example. On the other hand, if a
> fast-forward merge is possible I suppose this could be considered a
> non-conflicting change.

I would _like_ git to be able to merge submodules. However, if we want to keep limiting sub-modules to only track external independent 3rdparty modules, it isn't so useful I guess. But I also think that seriously reduces the usefulness of sub-modules.

Maybe a per-submodule flag that indicates whether or not it wants to be automatically merged from the supermodule? Closely coupled vs loosely coupled sub-modules.

- Finn Arne
Previous: Clemens BuchacherNext: Junio C Hamano
Message 5 of 15 in “different git-merge behavior with regard to submodules in 1.6.2.4 vs. 1.6.2.1”
  1. Tim OlsenApr 28, 2009
  2. Junio C HamanoApr 28, 2009
  3. Finn Arne GangstadApr 28, 2009
  4. Clemens BuchacherApr 29, 2009
  5. Finn Arne GangstadApr 29, 2009
  6. Teach gitlinks to combine-diffJunio C Hamano, Apr 29, 2009
  7. diff -c -p: do not die on submodulesJunio C Hamano, Apr 29, 2009
  8. Alex RiesenApr 29, 2009
  9. Johannes SchindelinApr 29, 2009
  10. Alex RiesenApr 29, 2009
  11. Johannes SchindelinApr 29, 2009
  12. Alex RiesenApr 30, 2009
  13. Finn Arne GangstadApr 30, 2009
  14. Junio C HamanoApr 29, 2009
  15. Junio C HamanoApr 29, 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.