opensource/loki
1
0
Fork 0
mirror of https://github.com/grafana/loki.git synced 2026-03-13 09:33:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Enable merge union strategy for CHANGELOG.md. (#5102)

Browse Source 
Summary:
This provides a reasonable automatic merge strategy for changelog
entries. No more merge conflicts on changelog changes.
This commit is contained in:
Karsten Jeschkies
2022-01-11 21:18:54 +01:00
committed by GitHub
parent 3091ccd3eb
commit 67a5c19b17
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored Normal file
View File

@@ -0,0 +1 @@
CHANGELOG.md merge=union