git flow in solving pull request conflict

Question

I am new on git on bitbucket and I am asking for the right flow to solve conflicts on pull requests for my local branch. I am doing this:

git checkout develop git pul