Is there such a thing as git pull --dry-run to see how stuff will be merged before it messes up my working tree?
git pull --dry-run
Right now I am doing:
git f
Since v2.27.0 there is a dry-run flag