OURS is always unchanged regarding BASE and we always take what we find in THEIRS --- without any exception. If we find something in THEIRS we copy and if we don't find we don't copy.
Only one case get's additional treatment: if THEIRS contains a deletion we trigger an explicit working tree cleanup.

From that point of view I liked the old comments more then this new one.