Skip to content

Commit c3a5ed0

Browse files
authored
Merge pull request #98 from jayvdb/changelog-union
🚧 .gitattributes merge strategies
2 parents 82f376d + 3652990 commit c3a5ed0

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

.gitattributes

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Include changes from both sides
2+
changelog.yml merge=union
3+
# Include regenerated files as-is using binary merge driver
4+
CHANGELOG.rst merge=binary

0 commit comments

Comments
 (0)