jj resolve
Resolve conflicted files with an external merge tool. More information: https://docs.jj-vcs.dev/latest/cli-reference/#jj-resolve.
- Resolve all conflicts:
jj resolve
- List all conflicts:
jj resolve
- Resolve conflicts in a given revision:
jj resolve
- Resolve conflicts in given files:
jj resolve
- Resolve accepting the incoming versions:
jj resolve --tool :theirs
- Resolve accepting the outgoing versions:
jj resolve --tool :ours
来源:tldr-pages contributors · 作者与贡献记录 · CC BY 4.0。离线整理了版式、链接和媒体显示。
