How can I fix a conflict in a pull request?

[Gifted Leather]

Suppose I have two branches, master and release/2.0, and I want to merge the release branch into master.

I do a pull request to merge release/2.0 to master, but, after the pull request has been done, I discover that there is a conflict (for example, application's version within the main POM).

How can I solve the conflict? Is the previous one (direct pull request in BitBucket) the right approach, or I have to perform the merge in my local environment and then make the pull request? In this case, which are the steps to perform?

Thanks in advance.

[Jimmy Seddon · Accepted solution]

Hi @Gifted Leather,

Any pull request that has conflicts will display a header like this:

If you click on the more information link you will get these detailed instructions on how to resolve the conflict:

I hope that helps!

-James

[Gabriela Costa]

@Gifted Leather my team developed this plugin: Power Editor for Bitbucket, which allows you to resolve conflicts on a pull request in the UI. You won't need to go through any of the git commands anymore (even though we highly recommend you learn them, they can be quite useful). Check it out and let me know if you have any questions.

It also supports:

• Adding, renaming and deleting files
• Editor extensions like preview, view diff and tab and space controls.
• Editing functionality in pull requests to quickly fix typos in files.
• Full support for hooks.

[Sandesh Shetty]

@Gifted Leather 

When merge conflicts are there ,it will show - which lines are conflicting. You have to resolve the merge conflicts before merging.

For more info refer this https://confluence.atlassian.com/bitbucket/resolve-merge-conflicts-704414003.html