On Mon, Dec 4, 2017 at 1:39 PM, David Turner <novalis@xxxxxxxxxxx> wrote: > When merging with a submodule modify/delete conflict (i.e. I've deleted > the submodule, and I'm merging in a branch that modified it), git lies > about what it is doing: > > "CONFLICT (modify/delete): submodule deleted in HEAD and modified in > submodules. Up to here the error message sounds correct, still? > Version submodules of submodule left in tree at > submodule~submodules. > Automatic merge failed; fix conflicts and then commit the result." This sounds as if the code assumed to handle only files. > In fact, the working tree does not contain anything named > 'submodule~submodules'. > > In addition, I would ordinarily resolve a conflict like this by using > 'git rm'. Here, this gives a warning: > > $ git rm submodule > submodule: needs merge (Regarding submodule merges in general:) Uh. We cannot add merge markers to a submodule or such. More importantly we'd have to ask the question if the merge conflict is on the superproject level (Choose one of the commits of the submodule) or on the submodule level (perform a merge in the submodule between the two commits) or some hybrid approach thereof. > rm 'submodule' > warning: Could not find section in .gitmodules where path=submodule The deletion of the submodule removed the .gitmodules entry, and the merge of the .gitmodules file presumably went fine. :/ I assume we need a special merge driver for the .gitmodules file to keep the submodule around when it is in at least one side. > Git's behavior here is significantly better than liggit2's (which tries > to check out 'submodule' as if it were a blob, and fails to do so), but > it's still confusing. > > It's not clear to me what the correct behavior is here. Maybe it's > sufficient to just fix the message? I think the first step is to fix the message to reflect reality. As alluded to above, I don't know what the correct merge behavior is (and where to put 'conflict markers'). Stefan
