On Jan 9, 2009, at 1:50 PM, Ask Bjørn Hansen wrote:
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
Replying to myself for the archives:
Looking in the code I noticed it's the recursive merge algorithm
giving that error. Making it use the resolve strategy ("git merge -s
resolve") made it work in the cases I had today, yay.
- ask
--
http://develooper.com/ - http://askask.com/
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
