Merge dependabot/npm_and_yarn/examples/typescript/http-server-pool/fastify-hybrid...

[poolifier.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 8ddca4bea480b8dfb25dcd55fc9a35cce5820184..d014f1b3a8032abb61dabb3f3ba3b85fe29debf1 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,17 @@
+# Created by git for backups. To disable backups in git:
+# $ git config --global mergetool.keepBackup false
+*.orig
+
+# Created by git when using merge tools for conflicts
+*.BACKUP.*
+*.BASE.*
+*.LOCAL.*
+*.REMOTE.*
+*_BACKUP_*.txt
+*_BASE_*.txt
+*_LOCAL_*.txt
+*_REMOTE_*.txt
+
 # Logs
 logs
 *.log
@@ -52,8 +66,15 @@ build/config.gypi
 # Mac
 .DS_Store
 
+# pnpm
+package-lock.json
+
 # Project specifics
 .eslintcache
-.history/
 .scannerwork
+*.bak
 lib
+dist
+tmp
+.history/
+reports/