Recent quotes:

“Without conflict resolution, two people making changes at the same time would clobber each other, and it would suck. But it wasn’t happening that often. So I just put in a comment saying ‘hey, we’ll have to fix this pretty soon.’ Four years later, that comment is still there and who cares? I thought it was going to be a problem, but it wasn’t. You can’t know what your biggest problems are going to be, so you can’t know what your features should be. Just do the shittiest thing you have to do.”