Resolve pull request conflicts

Using BitBucket,I created a branch off of master, made my changes, added, committed, pushed and created a pull request. Some time later I looked at the pull request via Navigation->Pull Requests. I see I have conflicts.

How do I fix these myself. I've read all the docs, but I'm still cloudy. Do I edit directly on BitBucket?


1 answer

0 vote

Hi, Michael.


According to this documentation, BitBucket should give you instructions to handle the conflicts. 

There are resolved using the command line, though you may be able to resolve them using some UI tool.


I hope it was helpful.

Kind regards,
Jaime Kirch da Silveira
Atlassian Cloud Support

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