Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add example configuration for IDEA as a merge tool #3614

Closed
wants to merge 1 commit into from
Closed

Add example configuration for IDEA as a merge tool #3614

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions docs/config.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Copy link
Collaborator

@Cretezy Cretezy May 3, 2024 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

merge-tools.idea.merge-args = ["merge", "$left", "$right", "$base", "$output"]
```

`jj` makes the following substitutions:
Expand Down