X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=.gitignore;h=92bdcf304e3059126e0d36db4facdfd814992bf7;hb=cc83559c04f5dde09d39c15b0d373c9a9b340ff7;hp=3a622e5d9846860203ea9f46b6870000015570fa;hpb=e8bdfa7163f394e9b0b2e0c41aea36f7ad9f42f2;p=e-mobility-charging-stations-simulator.git

diff --git a/.gitignore b/.gitignore
index 3a622e5d..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,4 +107,11 @@ Thumbs.db
 # MTA
 *.mta
 mta_archives/
-src/scripts/scriptConfig.json
+
+*.bak
+.eslintcache
+temp/
+*.tar.gz
+performanceRecords.json
+performanceRecords.json.lock
+*.db