You'd probably like reading about the megamerge workflow. I and others have linked some articles in a few comments here already.