[serf]

While I agree that a big diff isn't a good idea, I disagree with the notion that one should develop in such a way that makes Github (or whatever VCS you're using) work right.

I don't think working within the capabilities of the VCS you're using should ever be a priority for a software development effort; rather I think the VCS's priority should be to allow for their use within most contexts of software development. (the other way around)