mirror of
https://github.com/ivuorinen/cheatsheet-tldr.git
synced 2026-01-26 11:33:59 +00:00
34 lines
638 B
Plaintext
34 lines
638 B
Plaintext
---
|
|
syntax: markdown
|
|
tags: [tldr, common]
|
|
source: https://github.com/tldr-pages/tldr.git
|
|
---
|
|
# 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 {{[-l|--list]}}`
|
|
|
|
- Resolve conflicts in a given revision:
|
|
|
|
`jj resolve {{[-r|--revision]}} {{revset}}`
|
|
|
|
- Resolve conflicts in given files:
|
|
|
|
`jj resolve {{file1 file2 ...}}`
|
|
|
|
- Resolve accepting the incoming versions:
|
|
|
|
`jj resolve --tool :theirs`
|
|
|
|
- Resolve accepting the outgoing versions:
|
|
|
|
`jj resolve --tool :ours`
|