allow merging-up of patches with children, fix a problem in delete() where the base's list of children was not updated, and revise the logic of when the merge patch command is shown in the UI
show a warning before merging
handle the deletion of files
adding new files