unpack-trees: do not fail reset because of unmerged skipped entry