Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

Earn badges and make progress

You're on your way to the next level! Join the Kudos program to earn points and save your progress.

Deleted user Avatar
Deleted user

Level 1: Seed

25 / 150 points

Next: Root


1 badge earned


Participate in fun challenges

Challenges come and go, but your rewards stay with you. Do more to earn more!


Gift kudos to your peers

What goes around comes around! Share the love by gifting kudos to your peers.


Rise up in the ranks

Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!


Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
Community Members
Community Events
Community Groups

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

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.

1 answer

0 votes
Theodora Boudale
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
Sep 12, 2022

Hi Nathan,

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

Kind regards,

Suggest an answer

Log in or Sign up to answer
AUG Leaders

Atlassian Community Events