It's not just new files but all changes i.e.
```
git checkout upstream/master
git merge bob/newfeature
git diff -U0 upstream/master | pep8 --diff
```
should not produce any output.