How To Resolve Conflict In Bitbucket Pull Request? (2025)
How To Resolve Conflict In Bitbucket Pull Request? (2025)
Step: Go to the Bitbucket repository and open the Pull Request (PR)
with conflicts
Step 2: Click on "Resolve conflicts" to see the files with merge issues
Step Review the conflicting code sections in each file.
Step Open the conflicting files in your local repository using a code
editor like VSCode.
Step Manually resolve the conflicts by choosing the right code or
combining both versions.
Step After resolving the conflicts, commit the changes locally
Step Push the resolved changes back to the Bitbucket branch
Step Go back to the Pull Request and verify that the conflict is
resolved
Step: Once resolved, click "Merge" to complete the process.
Your conflict is now resolved in the Bitbucket Pull Request!