X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=.gitignore;h=5bf56abf9cd3fff2ba601c1f2bec88dc500351e4;hb=481c3802ecbdb0ae3cf75e028c7236f6b9b12671;hp=271df212f966d46c1e4172567b6f3ee1f3f77b0d;hpb=584bec1694824abb05dc4803cd9a5cf7780fe876;p=e-mobility-charging-stations-simulator.git

diff --git a/.gitignore b/.gitignore
index 271df212..5bf56abf 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,6 +110,9 @@ Thumbs.db
 *.mta
 mta_archives/
 
+# pnpm
+package-lock.json
+
 *.bak
 .eslintcache
 temp/