Mapped out most of the rebasing method, except actually merging the object changes.