🔧 update git settings to reflect npm to yarn change

VitorLuizC · Dec 22, 2019 · fceab53 · fceab53
1 parent 9dd9e42
commit fceab53
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/.gitattributes b/.gitattributes
@@ -2,4 +2,5 @@
 * text=auto eol=lf
 
 # Ignore lockfile's diffs.
-package-lock.json -diff
+# Since version 1.0, yarn can automatically resolve merge conflicts.
+yarn.lock -diff
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,8 @@ node_modules/
 
 # Distribution sources.
 dist/
+
+# PNPM and NPM's lockfile.
+# We're using Yarn and it provide its own lockfile.
+package-lock.json
+pnpm-lock.yaml