Reminder for laster, reset a branch to what its remote branch is:

git checkout -B master origin/master