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

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