CmdID

CmdID / Commands

jj-resolve

Resolve conflicted files with an external merge tool. tldr-pages

On several platforms

Opens CmdID with your command. It is read in your browser and sent nowhere.

Several platforms

from tldr-pages, CC BY 4.0

Resolve all conflicts

jj resolveIdentify

List all conflicts

jj resolve --listIdentify

Resolve conflicts in a given revision

jj resolve --revision revsetIdentify

Resolve conflicts in given files

jj resolve file1 file2 ...Identify

Resolve accepting the incoming versions

jj resolve --tool :theirsIdentify

Resolve accepting the outgoing versions

jj resolve --tool :oursIdentify