aghArdeshir
commented
3 years ago I would love to see this feature. Especially if we can see it when View in Tree mode. I would love to right click on a folder and select Accept all incoming. For all files recursively in that folder
Issue Type: Performance Issue
We need to include production build files of react in git as per our server configuration. Often the build files face merge conflict and we need to simply accept all incoming/current. But as the build files are too large, vscode can not resolve the conflict when I click accept all incoming/current. Where as, phpstorm can easily handle the action. I use vscode as my daily driver but when I need to resolve bulk merge conflict, I have to rely on phpstorm. This is getting annoying. This is the issue i am referring.
VS Code version: Code 1.47.2 (17299e413d5590b14ab0340ea477cdd86ff13daf, 2020-07-15T18:22:06.216Z) OS version: Windows_NT x64 10.0.18363
System Info
|Item|Value| |---|---| |CPUs|Intel(R) Core(TM) i7-5500U CPU @ 2.40GHz (4 x 2394)| |GPU Status|2d_canvas: enabledflash_3d: enabled
flash_stage3d: enabled
flash_stage3d_baseline: enabled
gpu_compositing: enabled
multiple_raster_threads: enabled_on
oop_rasterization: disabled_off
protected_video_decode: unavailable_off
rasterization: enabled
skia_renderer: disabled_off_ok
video_decode: enabled
viz_display_compositor: enabled_on
viz_hit_test_surface_layer: disabled_off_ok
webgl: enabled
webgl2: enabled| |Load (avg)|undefined| |Memory (System)|11.93GB (3.70GB free)| |Process Argv|| |Screen Reader|no| |VM|0%|
Process Info
``` CPU % Mem MB PID Process 1 78 8744 code main 11 65 4668 shared-process 0 12 5308 electron-crash-reporter 2 71 9424 window (Issue Reporter) 0 234 9896 window (Untitled-1 - pypepro - Visual Studio Code) 0 23 2936 searchService 0 156 4036 extensionHost 0 29 1504 "C:\Users\swaza\AppData\Local\Programs\Microsoft VS Code\Code.exe" "c:\Users\swaza\AppData\Local\Programs\Microsoft VS Code\resources\app\extensions\json-language-features\server\dist\node\jsonServerMain" --node-ipc --clientProcessId=4036 0 63 1892 electron_node intelephense.js 0 62 2888 "C:\Users\swaza\AppData\Local\Programs\Microsoft VS Code\Code.exe" "c:\Users\swaza\AppData\Local\Programs\Microsoft VS Code\resources\app\extensions\html-language-features\server\dist\node\htmlServerMain" --node-ipc --clientProcessId=4036 0 34 7352 "C:\Users\swaza\AppData\Local\Programs\Microsoft VS Code\Code.exe" "c:\Users\swaza\AppData\Local\Programs\Microsoft VS Code\resources\app\extensions\css-language-features\server\dist\node\cssServerMain" --node-ipc --clientProcessId=4036 0 681 8436 electron_node tsserver.js 25 187 9848 electron_node server.js 0 38 14104 electron_node tsserver.js 0 60 9256 "C:\Program Files\PowerShell\7\pwsh.exe" 0 14 12264 watcherService 0 6 3720 console-window-host (Windows internal process) 0 6 12864 console-window-host (Windows internal process) 0 208 10212 gpu-process 0 24 11196 utility ```Workspace Info
``` | Window (Untitled-1 - pypepro - Visual Studio Code) | Folder (pypepro): more than 29483 files | File types: php(7664) js(3397) png(1270) jpg(952) html(754) css(751) | svg(639) md(222) gif(172) json(120) | Conf files: package.json(8) gulp.js(3) launch.json(1) grunt.js(1) | Launch Configs: pwa-chrome; ```Extensions (14)
Extension|Author (truncated)|Version ---|---|--- Bookmarks|ale|11.3.1 vscode-intelephense-client|bme|1.5.2 htmltagwrap|bra|0.0.7 laravel-goto-view|cod|1.3.3 bracket-pair-colorizer-2|Coe|0.2.0 gitlens|eam|10.2.2 vsc-material-theme|Equ|32.8.0 vsc-material-theme-icons|equ|1.1.4 auto-close-tag|for|0.5.8 remote-wsl|ms-|0.44.4 laravel-blade|one|1.22.1 code-spell-checker|str|1.9.0 highlight-matching-tag|vin|0.9.9 better-align|wwm|1.1.6 (1 theme extensions excluded)