/intellij-merge-tool

VS Code extension for open merge tool of intellij

Primary LanguageTypeScript


Intellij Merge Tool

It is a vs code extension which open intellij merge tool on conflicted file.

Usage

after getting conflict by merge, you can right mouse click on conflicted file and click on mege with intellij first time you have to set any intellij tool path like:

/Applications/WebStorm.app/Contents/MacOS/webstorm

then you will get intellij mege tool.

Features

open intellij merge tool on conflicted file from VS code

License

MIT © Numan