mrva/vscode-codeql
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #450 from jcreedcmu/jcreed/gitattributes

Browse Source 
Use union merge strategy for CHANGELOG.md
This commit is contained in:
jcreedcmu
2020-06-15 15:35:07 -04:00
committed by GitHub
parent a6ed674816 249ab78249
commit 1f3707f74e
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.gitattributes vendored
View File

@@ -12,3 +12,10 @@ yarn.lock merge=binary
# For more information, see this issue: https://github.com/Microsoft/web-build-tools/issues/1088 # For more information, see this issue: https://github.com/Microsoft/web-build-tools/issues/1088
# #
*.json linguist-language=JSON-with-Comments *.json linguist-language=JSON-with-Comments
# Reduce incidence of needless merge conflicts on CHANGELOG.md
# The man page at
# https://mirrors.edge.kernel.org/pub/software/scm/git/docs/gitattributes.html
# suggests that this might interleave lines arbitrarily, but empirically
# it keeps added chunks contiguous
CHANGELOG.md merge=union