X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=.gitignore;h=92bdcf304e3059126e0d36db4facdfd814992bf7;hb=4bfd22def612cf8ad6e4a31c5d5df3ffcca45e70;hp=2b4ebbd73117cb2c27b7b62ab3bfac0a7ca9449f;hpb=f2b5e0a2ec564cc6d9ff32bb775de84578ec8542;p=e-mobility-charging-stations-simulator.git

diff --git a/.gitignore b/.gitignore
index 2b4ebbd7..92bdcf30 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,28 @@
 # config
-src/assets/config.json
+src/assets/config*.json
+!src/assets/config-template.json
+src/scripts/scriptConfig.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
@@ -86,3 +107,11 @@ Thumbs.db
 # MTA
 *.mta
 mta_archives/
+
+*.bak
+.eslintcache
+temp/
+*.tar.gz
+performanceRecords.json
+performanceRecords.json.lock
+*.db