More work on rebasing/merging.