Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> writes: > This change intentionally preserves a warning emitted on "git diff > --check". It's better to make it easily diff-able with upstream than > to fix whitespace changes in our version while we're at it. I think there are only two lines that needs to tolerate trailing whitespaces, and even if we strip them, it should be still easily diff-able with the upstream with --ignore-space-at-eol or whatever appropriate option, so I am not sure if it is worth try "keeping" these whitespace breakage. If you still want to do so, we should tweak .gitattributes so that "git diff --check" would not trigger. > 1. https://www.contributor-covenant.org/version/2/0/code_of_conduct/code_of_conduct.md Yes, thanks for the full URL. In 5cdf2301 (add a Code of Conduct document, 2019-09-24) we pointed at the HTML version, but if we ship MD and they have MD, using theirs as the base makes perfect sense. Sign-off plus acks need to be collected here. Thanks.