https://github.com/numandev1/intellij-merge-tool

VS Code extension for open merge tool of intellij
https://github.com/numandev1/intellij-merge-tool

intellij merge mergetool vscode-extension

Last synced: 3 months ago
JSON representation

VS Code extension for open merge tool of intellij

• Host: GitHub
• URL: https://github.com/numandev1/intellij-merge-tool
• Owner: numandev1
• Created: 2021-02-07T20:40:28.000Z (about 4 years ago)
• Default Branch: master
• Last Pushed: 2021-03-15T21:02:59.000Z (almost 4 years ago)
• Last Synced: 2024-11-02T13:11:45.420Z (3 months ago)
• Topics: intellij, merge, mergetool, vscode-extension
• Language: TypeScript
• Homepage:
• Size: 653 KB
• Stars: 16
• Watchers: 3
• Forks: 2
• Open Issues: 5
• Metadata Files:
  • Readme: README.md
  • Changelog: CHANGELOG.md

Awesome Lists containing this project

README

        


  


  



# 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](LICENSE.md) © Numan