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

diff --git a/.gitignore b/.gitignore
index 0439fb47..7a929e43 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,23 @@ 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
@@ -93,6 +109,8 @@ Thumbs.db
 *.mta
 mta_archives/
 
+*.bak
+.eslintcache
 temp/
 *.tar.gz
 performanceRecords.json