Linux command
jj-resolve 命令
文本
复制后可按需替换文件名、目录或参数。
常用示例
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]
说明
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.
参数
- -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.
FAQ
What is the jj-resolve command used for?
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.
How do I run a basic jj-resolve example?
Run `jj resolve` in a terminal, then adjust file names, paths, flags, or remote targets for your system.
What does -l, --list do in jj-resolve?
List files with conflicts instead of launching a merge tool.