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

diff --git a/.gitignore b/.gitignore
index 271df212..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