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

diff --git a/src/ui/web/.gitignore b/src/ui/web/.gitignore
index 9141c8ee..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
@@ -16,7 +30,9 @@ pnpm-debug.log*
 # Editor directories and files
 .idea
 .vscode/*
+!.vscode/settings.json
 !.vscode/launch.json
+!.vscode/extensions.json
 *.suo
 *.ntvs*
 *.njsproj