On https://github.com/sagemath/sage/pull/38486 I get a weird error from the CI docbuild. Apparently it's incremental, and tries (and fails) to merge the updated html file into the previous version (?). In the log I see:
CONFLICT (content): Merge conflict in html/en/reference/combinat/sage/combinat/matrices/hadamard_matrix.html The docs build just fine on "real" machine, and also, CI pdf docbuild succeeds. Is it a bug in the CI docbuild? Dima -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-devel+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/sage-devel/CAAWYfq0HkxM%3DX8Dozc_OwtDNcr6f%3DzHu_6yg3JQM1sj2hn%2BZ5g%40mail.gmail.com.
