chore: try to configure "npm install" as a merge tool to resolve pack…

…age-lock.json conflicts
headspinio · Apr 10, 2023 · ff118d3 · ff118d3
1 parent a4660b7
commit ff118d3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,3 @@
+* text=auto eol=lf
+# Handle as a text file but merge via `npm install`
+package-lock.json merge=npm
diff --git a/.gitconfig b/.gitconfig
@@ -0,0 +1,5 @@
+# to use this file, run:
+# git config --local include.path ../.gitconfig
+
+[mergetool "npm"]
+cmd = npm install