On Thu, Apr 26, 2018 at 10:56 AM, Stefan Beller <sbel...@google.com> wrote: > We often treating a submodule as a file from the superproject, but not always. > And in case of a merge, git seems to be a bit smarter than treating it > as a textfile > with two different lines.
Sure, but a submodule is checked out "at a commit", so if two branches of history are merged, and they conflict over which place the submodule is at.... shouldn't that produce a conflict?? I mean, how is the merge algorithm supposed to know which is right? The patch you linked appears to be able to resolve it to the one which contains both commits.. but that may not actually be true since you can rewind submodules since they're *pointers* to commits, not commits themselves. I'm not against that as a possible strategy to merge submodules, but it seems like not necessarily something you would always want... Thanks, Jake
