A typical workflow I have is to checkout master and type git reset --hard @{u}. From there I will checkout the branch I want to merge master with a
master
git reset --hard @{u}