Update changelog guidelines to prevent conflicts from blocking PRs (#2145)

* Update changelog guidelines to prevent conflicts from blocking PRs

As per consensus in https://github.com/rust-windowing/winit/issues/2135

* Add note about whitespace in changelog

* Add note about maintainer creating new tag
This commit is contained in:
Mads Marquart 2022-01-23 13:55:33 +01:00 committed by GitHub
parent 7cd273ae58
commit 2cc87cab65
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 3 deletions

2
.gitattributes vendored
View file

@ -20,5 +20,3 @@
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain
/CHANGELOG.md merge=union