Dealing with preserving merges and rebasing on feature finish.