<p>because this is mastodon, the edge case is this:</p><p>merging the branches together works when the source repos are non overlapping. it also works if you have two repos with a common history, and those repos do not have any other init commits.</p><p>however, if you have some repo that merges in another repo, and try to weave them together, you can&#39;t</p><p>as you&#39;re effectively asking it to merge two different histories for a single repo, and that just doesn&#39;t work out</p>
Reply