nordic-dev.net/vulkano
nordic-dev.net/vulkano
2
0
Fork 0
mirror of https://github.com/vulkano-rs/vulkano.git synced 2024-11-25 00:04:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add .gitattributes to automatically resolve merge conflicts on changelogs (#1176)

Browse Source
This commit is contained in:
Lucas Kent 2019-03-12 16:39:13 +11:00 committed by GitHub
parent dba468f38a
commit 3cb356e089
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored Normal file
View File

@ -0,0 +1,2 @@
CHANGELOG_VK_SYS.md=union
CHANGELOG_VULKANO.md=union

2
.github/PULL_REQUEST_TEMPLATE.md vendored
View File

@ -1,3 +1,3 @@
* [ ] Added an entry to `CHANGELOG.md` if knowledge of this change could be valuable to users * [ ] Added an entry to `CHANGELOG_VULKANO.md` or `CHANGELOG_VK_SYS.md` if knowledge of this change could be valuable to users
* [ ] Updated documentation to reflect any user-facing changes - in this repository * [ ] Updated documentation to reflect any user-facing changes - in this repository
* [ ] Updated documentation to reflect any user-facing changes - PR to the [guide](https://github.com/vulkano-rs/vulkano-www) that fixes existing documentation invalidated by this PR. * [ ] Updated documentation to reflect any user-facing changes - PR to the [guide](https://github.com/vulkano-rs/vulkano-www) that fixes existing documentation invalidated by this PR.