I'd vastly prefer a fix and rebase.