Uploaded image for project: 'Bitbucket Cloud'
  1. Bitbucket Cloud
  2. BCLOUD-16915

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

    XMLWordPrintable

Details

    Description

      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:

      Attachments

        Activity

          People

            Unassigned Unassigned
            42424f668897 Dmitriy
            Votes:
            1 Vote for this issue
            Watchers:
            2 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved: