Skip to content

Commit 3cb356e

Browse files
rukairukai
authored
Add .gitattributes to automatically resolve merge conflicts on changelogs (#1176)
1 parent dba468f commit 3cb356e

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

Diff for: ‎.gitattributes

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
CHANGELOG_VK_SYS.md=union
2+
CHANGELOG_VULKANO.md=union

Diff for: ‎.github/PULL_REQUEST_TEMPLATE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
* [ ] Added an entry to `CHANGELOG.md` if knowledge of this change could be valuable to users
1+
* [ ] Added an entry to `CHANGELOG_VULKANO.md` or `CHANGELOG_VK_SYS.md` if knowledge of this change could be valuable to users
22
* [ ] Updated documentation to reflect any user-facing changes - in this repository
33
* [ ] 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.

0 commit comments

Comments
 (0)