Check for clobber files and resolve/revert