{
  "slug": "jj-resolve-adds-the-editor-merge-tool-44e3adc7105e",
  "title": "jj resolve adds the :editor merge tool",
  "tools": [
    "jj"
  ],
  "tags": [
    "agent"
  ],
  "introduced_at": "2026-11-04T17:52:42.000Z",
  "announced_at": "2026-11-04T17:52:42.000Z",
  "effective_at": null,
  "date_basis": "source-publication",
  "status": "unknown",
  "how": {
    "incantation": "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.",
    "examples": [
      "jj resolve --tool :editor"
    ],
    "gotchas": [
      "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."
    ]
  },
  "why_it_matters": "Resolve a conflict in a file, including one with more than two sides, using a text editor.",
  "sources": [
    "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"
  ],
  "rank": 0.97027,
  "review_state": "approved",
  "provenance": {
    "run_id": "daily-20261104-21",
    "verdict_id": "daily-20261104-21:daily-20261104-21-d80d38df5552e854-8:gate",
    "evidence_hash": "87257204ffeb19d03a7ebaaac8e7bc5725147e0a1cefcd190630d15afab211dd"
  }
}