When doing a rebase of where one changeset updates a row, and the other changeset deletes a row, right now the delete "wins" and the update is completely discarded (only update/update edit conflicts are kept right now). It may be useful to record the update as well into the edit conflict file.