mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
* Reproducable fatal error while attempting to merge
@ 2015-07-13 20:34 Greg Logan
  0 siblings, 0 replies; only message in thread
From: Greg Logan @ 2015-07-13 20:34 UTC (permalink / raw)
  To: git

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 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  Help?


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2015-07-13 20:35 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-07-13 20:34 Reproducable fatal error while attempting to merge Greg Logan

Code repositories for project(s) associated with this public inbox

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).