jj-resolve
helps resolve merge conflicts
TLDR
Resolve conflicts
$ jj resolve
Resolve specific file$ jj resolve [path/to/file]
List conflicted files$ jj resolve --list
Resolve with specific tool$ jj resolve --tool [meld]
SYNOPSIS
jj resolve [options] [path]
DESCRIPTION
jj resolve helps resolve merge conflicts. It launches a merge tool for conflicted files.
The command identifies and processes files with conflict markers. Jujutsu tracks conflicts as first-class states.
PARAMETERS
PATH
Specific file to resolve.--list
List files with conflicts.--tool NAME
Merge tool to use.-r REV
Revision with conflicts.--help
Display help information.
CAVEATS
Subcommand of jj. Requires configured merge tool. Conflicts persist until resolved.
HISTORY
jj resolve is part of Jujutsu, supporting its unique approach to treating conflicts as normal repository states.