git submodule merge madness

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi,

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 Any ideas? Is there something we can do? I see a strong correlation between adding a new submodule and the number of "git sucks" messages on our internal IRC server.


 - 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

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux