Resolving Merge Conflicts in VSCode with Kaleidoscope’s 3-way Merge
VSCode is a powerful IDE that can be used with all the world’s programming languages through a vast ecosystem of extensions.
And now there is one more. The new Kaleidoscope extension for VSCode allows you to compare entire files, compare a selection of text, show git difftool results and run git mergetool.
The extension provides these functionalities through a comprehensive set of menu choices and toolbar buttons.