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

diff --git a/.gitignore b/.gitignore
index 271df212..92bdcf30 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,21 @@ mikro-orm.config*.ts
 !mikro-orm.config-template.ts
 manifest.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