jj resolve adds the :editor merge tool

Introduced 2026-11-04 · score 0.97

HOW TO USE IT

When a conflicted file needs text editing, run `jj resolve --tool :editor`; this opens the file with conflict markers and supports conflicts with any number of sides.

WHY THIS HELPS

Resolve a conflict in a file, including one with more than two sides, using a text editor.

REQUIREMENTS AND LIMITATIONS

• Version: v0.47.0
• Non-interactive: `:editor` opens the conflicted file in `ui.editor`; the editor must support the configured invocation, and GUI editors may need a wait option.
• --tool :editor: Selects the built-in editor merge tool; otherwise the configured merge editor is used.
• Prerequisite: A text editor must be available through `ui.editor` or its documented fallback settings.
• The editor tool opens the conflicted file with conflict markers.
• Unlike the other merge tools, `:editor` supports conflicts with more than two sides.

FIRST-PARTY EVIDENCE

• https://github.com/jj-vcs/jj/releases/tag/v0.47.0
• https://github.com/jj-vcs/jj/blob/v0.47.0/docs/config.md
• https://github.com/jj-vcs/jj/blob/v0.47.0/cli/src/commands/resolve.rs

Check the installed version and the source before using it. Entry JSON

Report a problem with this card