git rebase 1

Never make any changes on master!

git checkout master
git pull

git checkout dev
git rebase master

if conflicts:

manually resolve the conflicts in vi
git rebase --continue