X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=.gitignore;h=92bdcf304e3059126e0d36db4facdfd814992bf7;hb=7fddbedb65822b4d67a85191941a77e69cc60e8f;hp=60cdd67f95b45ce899d9f06a93e0ad2b96dac464;hpb=c27c3eeea356b0692bef2327bb59aa99f9cbad8d;p=e-mobility-charging-stations-simulator.git

diff --git a/.gitignore b/.gitignore
index 60cdd67f..92bdcf30 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,28 @@
 # config
-src/assets/config.json
+src/assets/config*.json
+!src/assets/config-template.json
 src/scripts/scriptConfig.json
-src/assets/authorization-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
@@ -89,6 +108,10 @@ Thumbs.db
 *.mta
 mta_archives/
 
+*.bak
+.eslintcache
+temp/
 *.tar.gz
-performanceMeasurements.json
+performanceRecords.json
+performanceRecords.json.lock
 *.db