Add example configuration for IDEA as a merge tool #3614
Conversation
Adds an additional example configuration for IntelliJ IDEA alongside kdiff3 and vimdiff.
|
I put a few more details in https://github.com/martinvonz/jj/wiki/Jetbrains-IntelliJ-IDEs earlier, though I'm not sure it's easy for people to find. I think we could link that wiki from |
| @@ -547,6 +547,10 @@ merge-tools.vimdiff.merge-args = ["-f", "-d", "$output", "-M", | |||
| "-c", "set write"] | |||
| merge-tools.vimdiff.program = "vim" | |||
| merge-tools.vimdiff.merge-tool-edits-conflict-markers = true # See below for an explanation | |||
|
|
|||
| # For IntelliJ IDEA or other JetBrains products on macOS | |||
| merge-tools.idea.program = "/Applications/IntelliJ IDEA.app/Contents/MacOS/idea" | |||
There was a problem hiding this comment.
We could add a note that for Linux, the launcher script is just idea (if on PATH, which is should be by default) after it's installed: https://www.jetbrains.com/help/idea/working-with-the-ide-features-from-command-line.html
|
Given that there is a wiki for things like this, maybe this doesn't need to go into the documentation? I wasn't aware the github wiki had anything on it. |
|
I don't think this should go into the documentation as-is. If anything, we could change the documentation to make the wiki easier to discover. (E.g. a mention that there is a config for IDEA there). |
Adds an additional example configuration for IntelliJ IDEA alongside kdiff3 and vimdiff.
Checklist
If applicable: