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

diff --git a/.gitignore b/.gitignore
index b1263465..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,7 @@ Thumbs.db
 *.mta
 mta_archives/
 
+*.bak
 .eslintcache
 temp/
 *.tar.gz