How do I solve conflict after creating a pull request?

riturajshukla

Hello! I created a pull request but unfortunately before pushing it in the branch I didn't pull the Master to check if there is any change done by anyone. And now, post creation of pull request I am getting this message in Bitbucket (Please see image).

How can I fix this?

Caterina Curti

Hi @riturajshukla,

Have you already tried following instructions on the How do I solve conflict after creating a pull request? page?

The documentation refers to Bitbucket Cloud (accessible at bitbucket.org) but can also be used for Bitbucket Server / self-hosted. In the end, the conflict is at the Git level so it applies to both platforms.

 

Cheers,

Caterina - Atlassian