I'd `git show develop:journal_lock.py > journal_lock.py` a copy in before, but forgot to commit it, and then removed it when checking out another branch complained. D'oh!