...
git fetch origin
git rebase origin/master
git reset --hard origin/master
(Check before doing this that git status is clear)
...
...
git fetch origin
git rebase origin/master
git reset --hard origin/master
(Check before doing this that git status is clear)
...