X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=.gitignore;h=0fbf851082422e595f9f94035b16fdb533993d1b;hb=5bbb9eda02244cc808550a959310b5fa04ede149;hp=0439fb4770a8221af3507c94e35fd5c1b21b6526;hpb=a7a5cda67c4edd0448a39678ca500f2f67d62902;p=e-mobility-charging-stations-simulator.git

diff --git a/.gitignore b/.gitignore
index 0439fb47..0fbf8510 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,16 +2,33 @@
 src/assets/config*.json
 !src/assets/config-template.json
 src/scripts/scriptConfig.json
-src/assets/*tags*.json
-!src/assets/authorization-tags-template.json
+src/assets/*idtags*.json
+!src/assets/idtags-template.json
 mikro-orm.config*.ts
 !mikro-orm.config-template.ts
-manifest.yml
+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
 *.log
 npm-debug.log*
+pnpm-debug.log*
 
 # Runtime data
 pids
@@ -93,8 +110,14 @@ Thumbs.db
 *.mta
 mta_archives/
 
+# pnpm
+package-lock.json
+
+*.bak
+.eslintcache
 temp/
 *.tar.gz
+/performance/
 performanceRecords.json
 performanceRecords.json.lock
 *.db