Hi folks, I'm encountering an error which kicks out an error that looks like this, every time: git merge upstream/r/1.6.x BUG: There are unmerged index entries: BUG: 2 modules/matterhorn-series-service-remote/pom.xml BUG: 3 modules/matterhorn-series-service-remote/pom.xml fatal: Bug in merge-recursive.c I'm attempting to merge the upstream 1.6.x branch from https://bitbucket.org/opencast-community/matterhorn/ into our master (which branched off from the upstream 1.5.x quite a while ago). There are common patches which have been applied to both branches, but in those cases they have *not* been cherry picked. Both of the repos are rather large, and one of them is actually private! I'm not sure how to proceed here in terms of attempting to resolve this issue. I've tried building Git from source, which did not resolve the issue. Adding '-X rename-threshold=95%' to the commandline allows the merge to proceed as expected, although I haven't actually finished it so I can't be sure that there aren't issues that have arisen due to the changed threshold - there are a number of conflicts. I have the merge log with GIT_MERGE_VERBOSITY=5 posted at http://pastebin.com/WxzrT5sb. Help? Thanks, G -- 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