X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fui%2Fweb%2F.gitignore;h=4bc4a6b8ddd5600e5dd833dd407130b176ea1beb;hb=6d93455a43e8628c857b1d393d92e937b357af01;hp=e710601c5fe09c5065c655efb2c8d384800e184b;hpb=88fc6aef9ecef71872897f75b03e8d6fcfc90e40;p=e-mobility-charging-stations-simulator.git

diff --git a/src/ui/web/.gitignore b/src/ui/web/.gitignore
index e710601c..4bc4a6b8 100644
--- a/src/ui/web/.gitignore
+++ b/src/ui/web/.gitignore
@@ -2,6 +2,20 @@
 node_modules
 /dist
 
+### 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
 
 # local env files
 .env.local