github/codeql-action
0
0
Fork 0
mirror of https://github.com/github/codeql-action.git synced 2026-05-13 18:10:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use merge=union for package.json

Browse Source
This commit is contained in:
Angela P Wen
2024-04-17 17:07:22 -07:00
parent baf3361f31
commit 3006970986
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitattributes
+2 -1
View File
@@ -1,9 +1,10 @@
lib/*.js linguist-generated=true
.github/workflows/__* linguist-generated=true
# Reduce incidence of needless merge conflicts on CHANGELOG.md
# Reduce incidence of needless merge conflicts on CHANGELOG.md and package.json
# 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
package.json merge=union