- I created pull request from bitbucket from develop to master branch.
- I see conflict in view, I submit pull request
I go to CLI, then go to my master branch, do git merge develop - conflict is shown also in CLI
I resolve conflict locally and push changes from CLI - i.e. git commit -m 'Fix conflict', then git push
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).