Start by pushing revisions around as necessary for merging.