Why does Bitbucket show a git conflict where there is none?

Question

We've had multiple Pull Request created in BitBucket that show conflicts in files (and therefore the PR is not mergeable), but there are no visible conflicts - often BB reports a conflict on simple prs where the only difference is a new line, but often the hash in the `composer.lock` file shows as a conflict, when there is clearly only a string change.

Theodora Boudale · Answer

Hi Kelvin,

I would suggest creating a ticket with the support team so we can investigate this further. If we have a support ticket, the engineer working on it will be able to access the affected PR and investigate.

You can create a ticket via https://support.atlassian.com/contact/#/; in "What can we help you with?" select "Technical issues and bugs" and then Bitbucket Cloud as a product. In the ticket description please provide the URL of an affected PR (that is not merged yet) and explain what the issue is.

Kind regards,
Theodora

Kelvin Tan_v90uzv · Answer

I am currently running into the similar issue where the bitbucket shows merge conflict on PR, but the feature branch is synced with the main branch. I did a test to merge the feature branch to the main branch with git command and they are just merged fine. I think there maybe some fundamantal  issues on my local git repo with how bitbucket handles the merge. my local git repo was working fine for the past 6 months.

I even did a test with create a branch on top of the latest main, and made a line change, and created a PR, the bitbucket still complains there's a merge conflict.

Any advice on resolving this issue?

Alex Miu · Answer

Thanks Theodora, I gave the issue a +1.