Can we hide conflicts and only see diffs in pull requests?

Alicia Pena
Contributor
February 26, 2018

Bitbucket now shows “conflicts” between your PR and master, which is handy sometimes, but it is painful when you’re trying to review the contents of a PR in isolation. Is there any way to hide the conflicts view and just see the diff?

1 answer

1 accepted

0 votes
Answer accepted
Ana Retamal
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
February 28, 2018

Hi Alicia! I'm afraid that's not possible. Conflicts can not be hidden, and they'll need to be resolved as explained at Resolve merge conflicts.

If you'd like to have that feature in Bitbucket Cloud, please feel free to submit your Feature request at Site/Master.

Hope that helps!

Ana

Alicia Pena
Contributor
February 28, 2018

Thanks Ana!

Ana Retamal
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
March 1, 2018

Glad I could help you! Have a nice day :)

Ana

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events