git: fix permissions on html docs
git: _really_ fix permissions on docs
Properly mark conflicts between open-mpi, libevent, lcdf-typetools.

Closes #22376.
Closes #23621.