X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=.gitignore;h=92bdcf304e3059126e0d36db4facdfd814992bf7;hb=75b4765719cddf8bcb1b15c25ffc27359d908126;hp=e5f78e905d235894145f5d0914dd240a8124758a;hpb=ae8ee665e864460d582b7f6d501b25225a1d7a4c;p=e-mobility-charging-stations-simulator.git

diff --git a/.gitignore b/.gitignore
index e5f78e90..92bdcf30 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,12 +2,27 @@
 src/assets/config*.json
 !src/assets/config-template.json
 src/scripts/scriptConfig.json
-src/assets/*tags.json
+src/assets/*tags*.json
 !src/assets/authorization-tags-template.json
 mikro-orm.config*.ts
 !mikro-orm.config-template.ts
 manifest.yml
 
+### 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
@@ -93,7 +108,10 @@ Thumbs.db
 *.mta
 mta_archives/
 
+*.bak
+.eslintcache
 temp/
 *.tar.gz
 performanceRecords.json
+performanceRecords.json.lock
 *.db