rebase

git pull origin {tracking branch} # ie 'dev'
git checkout my-feature
git rebase {tracking branch}
#resolve conflicts
git checkout {tracking branch}
git merge my-feature
git push origin {tracking branch}