apitech
/
loki
mirror of https://github.com/grafana/loki
1
0
Fork 0
Code Issues 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.
pull/5103/head
Karsten Jeschkies 4 years ago committed by GitHub
parent 3091ccd3eb
commit 67a5c19b17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 0 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      .gitattributes

1
.gitattributes vendored
Unescape View File

@ -0,0 +1 @@
CHANGELOG.md merge=union
Write Preview
Loading…
Cancel
Save