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.-l, --list
List files with conflicts instead of launching a merge tool.--tool NAME
Merge tool to use. The tool must be configured in `ui.merge-editor` or `merge-tools.<name>`. Mutually exclusive with --list.-r, --revision REVSET
Revision whose conflicts should be resolved (default `@`).--help
Display help information.
INSTALL
sudo pacman -S jujutsu
sudo apk add jujutsu
sudo zypper install jujutsu
brew install jujutsu
nix profile install nixpkgs#jujutsu
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.
SEE ALSO
jj(1), jj-squash(1), jj-status(1), jj-new(1), jj-describe(1)