Merge branch 'master' into feature/task-functions

[poolifier.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 2ac23b4dcd7693112a53537111e23655dcb1603f..5e16da97408b119188687c09d5dd811b45d30b7d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,18 @@
+### Git ###
+# 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
@@ -36,10 +51,31 @@ jspm_packages
 # Optional REPL history
 .node_repl_history
 
-# Project specifics
-.vscode/
+# VisualStudioCode
+.vscode/*
+!.vscode/extensions.json
+!.vscode/launch.json
+!.vscode/settings.json
+!.vscode/tasks.json
+
+# Intellij
+/.idea
+/outputs
+/docker/mongo
+build/config.gypi
 
 # Mac
-.DS_Store/
+.DS_Store
+
+# pnpm
+package-lock.json
 
-.history/
\ No newline at end of file
+# Project specifics
+.eslintcache
+.history/
+.scannerwork
+*.bak
+lib
+dist
+tmp
+reports/