Rebase with master

git checkout master
git pull master
git checkout dev_branch
git rebase master
git rebase --continue
git add
git commit
git push -f origin dev_branch