Want ability to be able to see files with conflicts easily for merge commits / pull requests

Issue #15083 closed
Mit Suthar
created an issue

Right now to be able to review the merge pull requests reliable I have to fetch the pull request locally and open the merge commit with gitk to review the changes in files with conflicts. It would be nice to be able to do that from pull requests.

Something similar to what gitk gives for merge commits (see the attachment).

Comments (1)

  1. Alastair Wilkes staff

    Hi Mit,

    The pull request/diff view should display conflicts like this:

    Screen Shot 2017-11-08 at 11.16.10 AM.png

    Are these not showing up for you, or are you asking for something else? Thanks!

    Alastair
    Bitbucket PM

  2. Log in to comment