git push default = upstream
pytest should tb=short by default
global auto-revert mode
git df patience
merge conflicts