Issue #8069 open

conflict warning exists but no details when there is a conflict in the submodules. (BB-12204)

Sahin Boydas
created an issue

Please check the attachment.

There is no confilct in the files, the merge button shows a warning. because there is conflict with the submodules...

Comments (13)

  1. Sahin Boydas reporter

    this is a simple .... check my screen shot again....

    conflict warning exists but no details when there is a conflict in the submodules.

    please read it again..

    There is no confilct in the files, the merge button shows a warning. because there is conflict with the submodules...


    which part u didnt understand? this is not happening in support.atlassian.com.. this is an error in happening in bitbucket...

  2. Marcus Bertrand staff

    Sahin,

    I need to be able to see this Pull Request in Bitbucket as we haven't seen this before. Since this issue tracker is public, I requested that you please tell me the URL in support, which is private.

    If you'd prefer, you can give it to me here, in public. Either way, I'll need to see a live example of this issue to be able to properly reproduce and investigate.

  3. Sahin Boydas reporter

    Marcus hi,

    Thx for the response.

    The url will be a perfect.

    We are in private repos so np.

    first check this. https://bitbucket.org/movielalainc/web/pull-request/425/feed-engagement-acceptance-tests-rspec/diff

    then u will see that I updated the PR, after commited updated submodules.

    https://bitbucket.org/movielalainc/web/pull-request/425/feed-engagement-acceptance-tests-rspec/commits

    This problem happen all the time, if u cannot see from above. I will share a link that is in live real in few days for sure...

  4. Log in to comment