Using PR

#create a new branch
git checkout -b branch-name

#before pushing
git checkout master
git pull origin master
#it goes for the last branch used
git checkout -
#it will show conflicts
git rebase master
- if conclict == true
  git add .
  git rebase --continue
  #abort rebase
  git rebase --abort
  

#create branch-name in repository
git push origin branch-name

#go to bitbucket or git and ask for PR from branch-name to master branch