Do not remove files that have been edited when doing an "update".  Instead,
mark the files as CONFLICT.