octopus merge when merged branches have unrelated histories

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

 



Hello,

I want to understand if this behavior is as intended:
Suppose we have 3 branches A, B, C. A has common history with B and C (due to previous merge, for example), while B and C have unrelated histories.
Doing regular simple merge from B into A and then from C into A works smoothly, however when attempting to do an octopus merge into A from B and C simultaneously git complains with "fatal: refusing to merge unrelated histories". With -allow-unrelated-histories git octopus does two simple merges and it works fine.

Is this the intended behavior or is this an oversight? From my point of view the merges are done from branches B and C into A so it shouldn't matter whether B and C have related histories or not (and it doesn't matter in practice as evidenced by successful merge), only if A has related histories with each of them.

Best regards,
Danila





[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