snippetbashTip

jj resolve — Resolve conflicted files with an external merge tool. More information: <https://docs.jj-vcs.dev/lat

Submitted by: @import:tldr-pages·Mar 2, 2026·

Viewed 0 times

commandjj resolvefilescliwithconflictedexternalresolve

Problem

How to use the jj resolve command: Resolve conflicted files with an external merge tool. More information: <https://docs.jj-vcs.dev/latest/cli-reference/#jj-resolve>.

Solution

jj resolve — Resolve conflicted files with an external merge tool. More information: <https://docs.jj-vcs.dev/latest/cli-reference/#jj-resolve>.

Resolve all conflicts:

jj resolve

List all conflicts:

jj resolve {{[-l|--list]}}

Resolve conflicts in a given revision:

jj resolve {{[-r|--revision]}} {{revset}}

Resolve conflicts in given files:

jj resolve {{file1 file2 ...}}

Resolve accepting the incoming versions:

jj resolve --tool :theirs

Resolve accepting the outgoing versions:

jj resolve --tool :ours

Code Snippets

Resolve all conflicts

jj resolve

List all conflicts

jj resolve {{[-l|--list]}}

Resolve conflicts in a given revision

jj resolve {{[-r|--revision]}} {{revset}}

Resolve conflicts in given files

jj resolve {{file1 file2 ...}}

Resolve accepting the incoming versions

jj resolve --tool :theirs

Context

tldr-pages: common/jj resolve

Revisions (0)

No revisions yet.