-
Type:
Bug
-
Resolution: Fixed
-
Priority:
Low
-
Affects Version/s: 3.8.0
-
Component/s: None
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
- Create a binary file and add it to the repository
- Create two branches, branch_a and branch_b
- On both branches modify the binary in a way that makes it different
- Push both branches to Stash
- Create a pull request from branch_b to branch_a
- The pull request diff preview will show that the binary file was changed and will be included

- The pull request diff preview will show that the binary file was changed and will be included
- 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.