make sure `git pull --ff-only origin/master` works
# general
w
make sure
git pull --ff-only origin/master
works