jj resolve

all

Resolve conflicted files with an external merge tool.

Options (2)

-l, --listboolean

List all conflicts

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

-r, --revisionboolean

Resolve conflicts in a given revision

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

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