'git mergetool with intellij Idea's community edition on windows
I'm using GitExtensions windows software to work with git and i had many trouble configuring it to work with Idea's community edition, to use it as a merge tool. I've installed version 2022.1 of intelliJ Idea community
I followed the instructions here https://coderwall.com/p/gc_hqw/use-intellij-or-webstorm-as-your-git-diff-tool-even-on-windows but it didn't worked for me for conflict resolution
i went to the folder c:\users<login> to edit the .gitconfig file and i added the following sections in it
[merge]
tool = intellij
[mergetool "intellij"]
cmd = cmd.exe //c "\"C:/Program Files/IntelliJ IDEA Community Edition 2022.1/bin/idea.bat\" merge \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\""
trustExitCode = true
but nothing was launched when launching the mergetool
Sources
This article follows the attribution requirements of Stack Overflow and is licensed under CC BY-SA 3.0.
Source: Stack Overflow
Solution | Source |
---|