Pull request is not showing changed binary files when there are conflicts with target branch

Issue #16915 open
Dmitriy Belyaev
created an issue

Pull-request will show 'Files changed (0)' (meaning no diffs available) when there are conflicts with target branch.

public example repository can be found here: git@bitbucket.org:pure-apricot/test-binary-conflicts.git

Steps how repository was created:

  1. create 'master'-branch with a file in initial state (in my case: application.apt)
  2. create 'develop'-branch from 'master'
  3. change some lines in application.apt file in 'develop'
  4. create 'feature/test'-branch from 'master'
  5. change same lines in application.apt file in 'feature/test' (in order to get merge conflicts with 'develop')
  6. create pull-request targeting develop (should have unresolved conflict, file is not shown in 'DIFF' pane of pull request)

Link to example pull request.

Screenshot:

pr-conflicts-bug.JPG

Comments (5)

  1. Log in to comment