X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=.gitignore;h=47cb73efa67f394e44e61b1d8ddd8d75445a8ed7;hb=ba62a535da8d31400787113da1f77282967abb65;hp=b126346579c600d3863d446bf5c85d840fff0413;hpb=c1f282d9d8aa13afe8c3fcd6cf33a496b5b72bed;p=e-mobility-charging-stations-simulator.git

diff --git a/.gitignore b/.gitignore
index b1263465..47cb73ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,12 +6,29 @@ src/assets/*tags*.json
 !src/assets/authorization-tags-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,10 @@ Thumbs.db
 *.mta
 mta_archives/
 
+# pnpm
+package-lock.json
+
+*.bak
 .eslintcache
 temp/
 *.tar.gz