X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=.gitignore;h=7a929e43586815f8d779fe5f4d3bdb6b557aee74;hb=439fc71b2ebd8322233792b2f3c466e3ddd6e354;hp=5dfe331fa4d91000fc72e23bd62721875b4f9757;hpb=6ce0bca57a96ef920df4e0786d8f28b0b89a36ef;p=e-mobility-charging-stations-simulator.git

diff --git a/.gitignore b/.gitignore
index 5dfe331f..7a929e43 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +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
-manifest.yml
+src/assets/*tags*.json
+!src/assets/authorization-tags-template.json
+mikro-orm.config*.ts
+!mikro-orm.config-template.ts
+manifest*.yml
+!manifest-cf-template.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
@@ -89,4 +109,10 @@ Thumbs.db
 *.mta
 mta_archives/
 
+*.bak
+.eslintcache
+temp/
 *.tar.gz
+performanceRecords.json
+performanceRecords.json.lock
+*.db