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

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