Resolve Bitbucket Pull Request Conflict

Open cmd in your local repository and execute the following commands:

git checkout destination-branch

git pull origin destination-branch

git checkout source-branch

git pull origin source-branch

git merge destination-branch

=> conflicts that need to be solved

 - open file in notepad++ and modify, then save.

git add file_that_was_modified

git commit -m "fixed file_that_was_modified conflict"

git push origin source-branch

done