Pull Request page shows commit diff in merge conflict

[Teh Kok How]

Hello,

    I am using Bitbucket Stash. I found out that that the Pull-Request page shows only merge conflict in Diff tab. Is it possible to show commit diff in the Pull-Request page? It is difficult to merge the conflict without knowledge of changes in the Pull-Request commit.

[Caterina Curti]

Hi @Teh Kok How,

At this time, it is not possible to show the merge conflict details (i.e. the changes of the source and the target) in the Pull Request Overview tab.

Only the Diff tab can display all the details.

However, in case of a conflict the Overview tab will say:

This pull request can't be merged.

You will need to resolve conflicts to be able to merge. More information.

Here is a screenshot:

Also the Bitbucket Server dashboard (available at <Bitbucket URL>/dashboard) indicates when a Pull Request contains a conflict by adding a lozenge next to it:

Do you see these when accessing the locally installed Bitbucket Server?

Cheers,

Caterina - Atlassian

[Teh Kok How]

What I meant was to show both merge conflict and the diff between source and target of the pull request. This is critical especially when the PR has been submitted and pending review for quite sometime for us to check what was the initial change created by the PR. Currently, the "Diff" tab only shows the merge conflict and it is difficult to recall what was the initial change by the PR.

[Caterina Curti]

Hey @Teh Kok How,

I'm not sure I understand this. Let me share some screenshots and maybe you can help me by pointing into the right direction.

The "Show diff of" drop down allows to check the diffs for all pushed commits instead of the overall list of all changes:

 

The "View the full source of this file" allows you to browse to the file directly and display the various commits in every branch: