Resolve pull request conflicts

[Michael Jackson]

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?

[Jaime S]

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