Pull request diff does not show conflicts for binary files

XMLWordPrintable

      Binary files that have a conflict between the source and destination branch are not shown in the diff, but do show in the pull request preview screen. The pull request cannot be merged because of a conflict, but there are no changes shown.

      Steps to reproduce

      1. Create a binary file and add it to the repository
      2. Create two branches, branch_a and branch_b
      3. On both branches modify the binary in a way that makes it different
      4. Push both branches to Stash
      5. Create a pull request from branch_b to branch_a
        1. The pull request diff preview will show that the binary file was changed and will be included
      6. After the pull request has been created, the diff will not show any files but that the pull request cannot be merged because of a conflict

      Expected Result

      Stash will show the conflicted binary files in the pull request diff.

            Assignee:
            Daniil Penkin
            Reporter:
            Jeff Thomas
            Votes:
            0 Vote for this issue
            Watchers:
            5 Start watching this issue

              Created:
              Updated:
              Resolved: