We were going to be dealing with exactly this issue. The plan was for there to be planned integration dates when all the development teams would check in their code and reset their images. At that time, if needed, we could get a new copy of the system from production so that we reflect the latest production code.

Of course, since our entire plan never got off the ground, I can't tell you how that plan worked in practice. If you do figure something out, I'd be interested in hearing about it.