A good commit
More good code
More bad commits
Merge branch 'master' into branch-with-badness