You're on your way to the next level! Join the Kudos program to earn points and save your progress.
Level 1: Seed
25 / 150 points
1 badge earned
Challenges come and go, but your rewards stay with you. Do more to earn more!
What goes around comes around! Share the love by gifting kudos to your peers.
Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!
Join now to unlock these features and more
The Atlassian Community can help you and your team get more value out of Atlassian products and practices.
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.
Conflicts are indicated by Git, I would advise you to first check if conflicts show locally as well when you run into this issue again. In your local clone of the repo, pull the latest changes for both the source and the destination branch. Then, copy-paste the clone directory to a different location for testing purposes, and try to merge the branches in the copied directory and see if you get any conflicts.
If you don't see any conflicts, I would suggest creating a ticket with the support team to look into this. 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 product. In the ticket description please provide the URL of a PR with this issue; the PR needs to be open and not merged yet so we can investigate the issue while it is occurring.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.