1. git checkout dev-david
2. git rebase master
3. git add .
4. git rebase --continue

===
Successfully rebased and updated refs/heads/dev-david.
==
5. git push origin dev-david --force
6. git checkout master
7. git merge dev-david 
8. git push

git rebase --continue
git rebase --abort