In a similar vein to git reset --hard feature/weavils
you can just overwrite untracked working files (typically left over from branch experiments) which are part of the remote branch you're pulling like this:
git reset --hard origin/feature/weavils
Normally, if you tried git checkout feature/weavils
you'd get warnings like untracked working tree files would be overwritten by merge
, so hit them with the --hard
hammer instead.
(Found via https://stackoverflow.com/q/17404316/391826 and one of the answers: https://stackoverflow.com/a/36824493/391826)