Mainly notes to future-Twig (and for anyone else who may find them useful)
Use "git checkout -- filename" to revert a file. The "--" ensures that it recognises filename as a path and not a branch.
[ Source ]