Pull request shows conflict when there is none.

Ok so i manually solved ALL conflicts and the file list shows that there are no conflicts.

as you can see here http://prntscr.com/8j3j14

but the button merge shows there is a conflict, but in reality there is none. There just isnt, everything should just work, but doesnt.

1 answer

0 vote

Hi Alex, 

I believe this will requires a further investigation and gathering more information as well.  Do you mind to raise a ticket to us so we can investigate this issue?

 

Regards

Renato Rudnicki 

Suggest an answer

Log in or Sign up to answer
Atlassian Community Anniversary

Happy Anniversary, Atlassian Community!

This community is celebrating its one-year anniversary and Atlassian co-founder Mike Cannon-Brookes has all the feels.

Read more
Community showcase
Piotr Plewa
Published Dec 27, 2017 in Bitbucket

Recipe: Deploying AWS Lambda functions with Bitbucket Pipelines

Bitbucket Pipelines helps me manage and automate a number of serverless deployments to AWS Lambda and this is how I do it. I'm building Node.js Lambda functions using node-lambda&nbsp...

1,770 views 1 5
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