Bitbucket can not create merge diff or merge Edited

We're using the Gitflow Workflow and have migrated from a Mercurial repo (where we were using the same workflow).

Between the previous release and this, we did some management of a third-party library, previously cloned from git (when we were using Mercurial). Not entirely sure about this part, but I believe as part of the conversion, the .git-folder in the library was deleted.

Now, I created a pull request to merge our release branch (which does not have the .git folder) with the master branch (which has the .git folder). Bitbucket Server says "Bitbucket Server could not create the merge diff for this pull request"

The merge button is available, and if I try to perform a merge I get

'/usr/bin/git reset --quiet 4d5ac1b2a903ab1cd371c2fb39dc87fca107fdfa --' exited with code 128 saying: error: Invalid path 'vendor/CException/.git/HEAD' fatal: make_cache_entry failed for path 'vendor/CException/.git/HEAD'

I can however merge locally on my machine.

Any ideas on how to resolve this?

0 answers

Suggest an answer

Log in or Sign up to answer
Community showcase
Published Aug 21, 2018 in Bitbucket

Branch Management with Bitbucket

As a project manager, I have discovered that different developers want to bring their previous branching method with them when they join the team. Some developers are used to performing individual wo...

2,374 views 9 12
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you