{"thread":{"id":"39841","subject":"Reproducable fatal error while attempting to merge","startedAt":"2015-07-13T20:34:59Z","lastAt":"2015-07-13T20:34:59Z","messageCount":1,"participants":["Greg Logan"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"266090","messageId":"CAGQUBiSEyJCWmqScANh8nNN6Rinp3sQ7syYe-Rm7gJJy7iTZaQ@mail.gmail.com","threadId":"39841","inReplyTo":null,"subject":"Reproducable fatal error while attempting to merge","fromName":"Greg Logan","fromEmail":"gregorydlogan@gmail.com","sentAt":"2015-07-13T20:34:59Z","receivedAt":"2015-07-13T20:34:59Z","isPatch":false,"sender":{"key":"gregorydlogan@gmail.com","avatar":null},"body":"Hi folks,\n\nI'm encountering an error which kicks out an error that looks like\nthis, every time:\n\ngit merge upstream/r/1.6.x\nBUG: There are unmerged index entries:\nBUG: 2 modules/matterhorn-series-service-remote/pom.xml\nBUG: 3 modules/matterhorn-series-service-remote/pom.xml\nfatal: Bug in merge-recursive.c\n\nI'm attempting to merge the upstream 1.6.x branch from\nhttps://bitbucket.org/opencast-community/matterhorn/ into our master\n(which branched off from the upstream 1.5.x quite a while ago).  There\nare common patches which have been applied to both branches, but in\nthose cases they have *not* been cherry picked.\n\nBoth of the repos are rather large, and one of them is actually\nprivate!  I'm not sure how to proceed here in terms of attempting to\nresolve this issue.  I've tried building Git from source, which did\nnot resolve the issue.  Adding '-X rename-threshold=95%' to the\ncommandline allows the merge to proceed as expected, although I\nhaven't actually finished it so I can't be sure that there aren't\nissues that have arisen due to the changed threshold - there are a\nnumber of conflicts.  I have the merge log with GIT_MERGE_VERBOSITY=5\nposted at http://pastebin.com/WxzrT5sb.  Help?\n\nThanks,\nG\n"}]}