Hi, On Fri, 9 Jan 2009, Ask Bjørn Hansen wrote: > We've (again) replaced a few directories with submodules. Man, it's > madness! > > The typical problem is that we get an error trying to merge a "pre-submodule" > branch into master: > > fatal: cannot read object 894c77319a18c4d48119c2985a9275c9f5883584 > 'some/sub/dir': It is a submodule! > Mark Levedahl wrote an example in July, but I don't think he got any replies: > http://marc.info/?l=git&m=121587851313303 So.... Which Git version are you are using? Did you test any Git version containing the commit d5a84fb(merge-recursive: fail gracefully with directory/submodule conflicts)? Ciao, Dscho
