git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Greg Logan <gregorydlogan@gmail.com>
To: git@vger.kernel.org
Subject: Reproducable fatal error while attempting to merge
Date: Mon, 13 Jul 2015 14:34:59 -0600	[thread overview]
Message-ID: <CAGQUBiSEyJCWmqScANh8nNN6Rinp3sQ7syYe-Rm7gJJy7iTZaQ@mail.gmail.com> (raw)

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

                 reply	other threads:[~2015-07-13 20:35 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CAGQUBiSEyJCWmqScANh8nNN6Rinp3sQ7syYe-Rm7gJJy7iTZaQ@mail.gmail.com \
    --to=gregorydlogan@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).