Conflict still shown after successfully resolved and merged from CLI.

Issue #16673 closed
Peter Parada
created an issue

The steps:

  1. I created pull request from bitbucket from develop to master branch.

Screen Shot 2018-07-11 at 12.36.13 PM.png

Screen Shot 2018-07-11 at 12.36.21 PM.png

  1. I see conflict in view, I submit pull request

Screen Shot 2018-07-11 at 12.37.20 PM.png

  1. I go to CLI, then go to my master branch, do git merge develop - conflict is shown also in CLI

  2. I resolve conflict locally and push changes from CLI - i.e. git commit -m 'Fix conflict', then git push

  3. I open bitbucket with my PR, it shows as merged - but conflict is still shown there, although it was resolved (from technical point of view - code is fine, this is just that conflict shouldn't be seen here after resolve).

Screen Shot 2018-07-11 at 12.38.30 PM.png

Screen Shot 2018-07-11 at 12.38.49 PM.png

Screen Shot 2018-07-11 at 12.39.00 PM.png

Comments (2)

  1. Log in to comment