Fixing a common problem with a Git Merge

Please enter a commit message to explain why this merge is necessary

commitgitgit-mergemergemessage

Finally Released: 3-Column Merge Editor in VS Code!

The biggest drawback of using VS Code compared to WebStorm has been solved.

diffgitmergemerge-conflictmerge-conflictsmerge-editormerge-toolmerge-toolsvscodevscode-extensionsvscode-mergevscode-merge-conflictvscode-merge-conflictsvscode-merge-editorvscode-merge-toolvscode-merge-toolsvscode-pluginvscode-plugins