jj-resolve(1)

🌸 jj-resolve — bestie edition 🌸

okay so this is the manual for jj-resolve(1), straight outta the General Commands Manual, and it's literally the "resolve conflicted files with an external merge tool" command. No cap. Let's get into it 💅✨

---

✨ NAME ✨

jj-resolve — resolve conflicted files with an external merge tool 🫶

---

✨ SYNOPSIS ✨

jj resolve [-r|--revision] [-R|--repository] [--ignore-working-copy]
[-l|--list] [--no-integrate-operation] [--tool] [--ignore-immutable]
[--at-operation] [--debug] [--color] [--quiet] [--no-pager] [--config]
[--config-file] [-h|--help] [FILESETS]

---

✨ DESCRIPTION ✨

Resolve conflicted files with an external merge tool. periodt.

Only conflicts that can be resolved with a 3-way merge are supported. See docs for merge tool configuration instructions. External merge tools will be invoked for each conflicted file one-by-one until all conflicts are resolved. To stop resolving conflicts, exit the merge tool without making any changes. like, just close it and walk away, it's fine 😭

Note that conflicts can also be resolved without using this command. You may edit the conflict markers in the conflicted file directly with a text editor. so if you're a "manual labor but make it text editor" kind of bestie, that's valid too 🎀

---

✨ OPTIONS ✨

• -r, --revision <REVSET> — the revision you're resolving conflicts in, and it defaults to @ (your working-copy commit, iykyk) [default: @]
• -l, --list — instead of resolving conflicts, list all the conflicts 👑 like a little conflict census
• --tool <NAME> — specify the 3-way merge tool to be used

The built-in merge tools :ours and :theirs can be used to choose side #1 and side #2 of the conflict respectively. so if you're feeling "my side only" or "their side only", that's the vibe 💅

• -h, --help — print help (see a summary with -h) 🫶
• [FILESETS] — only resolve conflicts in these paths. You can use the --list argument to find paths to use here. perfect for when you wanna be picky about which files get the merge-tool treatment ✨

---

🌈 GLOBAL OPTIONS 🌈

• -R, --repository <REPOSITORY> — path to repository to operate on

By default, Jujutsu searches for the closest .jj/ directory in an ancestor of the current working directory. it literally goes looking for its home 🏠

• --ignore-working-copy — don't snapshot the working copy, and don't update it

By default, Jujutsu snapshots the working copy at the beginning of every command. The working copy is also updated at the end of the command, if the command modified the working-copy commit (@). If you want to avoid snapshotting the working copy and instead see a possibly stale working-copy commit, you can use --ignore-working-copy. This may be useful e.g. in a command prompt, especially if you have another process that commits the working copy. lowkey handy for scripts, highkey chaotic if you forget

Loading the repository at a specific operation with --at-operation implies --ignore-working-copy. so that's automatic, bestie 🦋

• --no-integrate-operation — run the command as usual but don't integrate any operations

When this option is given, the operations will still be created as usual but they will not be integrated to the operation log. The working copy will also not be updated. 💀 it's giving "do the thing but don't commit to the thing"

The command will print the resulting operation ID. You can pass that to e.g. jj --at-op to inspect the resulting repo state, or you can pass it to jj op restore to restore the repo to that state. You can also pass the ID to jj op integrate to integrate the operation. so many doors, so many keys 🔑

Note that this does not prevent side effects outside the repo. For example, jj git push --no-integrate-operation will still perform the push. yes bestie, the push still pushes. no take-backsies 🚨

• --ignore-immutable — allow rewriting immutable commits

By default, Jujutsu prevents rewriting commits in the configured set of immutable commits. This option disables that check and lets you rewrite any commit but the root commit. it's the "rules are made to be broken" flag, but only for this exact check ✨

This option only affects the check. It does not affect the immutable_heads() revset or the immutable template keyword. so the immutable vibe stays immutable, no cap 🧚

• --at-operation <AT_OPERATION> — operation to load the repo at

Operation to load the repo at. By default, Jujutsu loads the repo at the most recent operation, or at the merge of the divergent operations if any. it's like time travel but for your repo ⏳

You can use --at-op=<operation ID> to see what the repo looked like at an earlier operation. For example jj --at-op=<operation ID> st will show you what jj st would have shown you when the given operation had just finished. --at-op=@ is pretty much the same as the default except that divergent operations will never be merged. cute, right?

Use jj op log to find the operation ID you want. Any unambiguous prefix of the operation ID is enough. you don't need the whole thing, just enough to be recognizable 💅

When loading the repo at an earlier operation, the working copy will be ignored, as if --ignore-working-copy had been specified. automatic ghost mode 👻

It is possible to run mutating commands when loading the repo at an earlier operation. Doing that is equivalent to having run concurrent commands starting at the earlier operation. There's rarely a reason to do that, but it is possible. so like, yes you can, but why would you? still, the door is open 🚪

• --debug — enable debug logging 🐛
• --color <WHEN> — when to colorize output

Possible values:

• always
• never
• debug
• auto

pick your aesthetic 🌈

• --quiet — silence non-primary command output

For example, jj file list will still list files, but it won't tell you if the working copy was snapshotted or if descendants were rebased. so it's the "less yapping, more doing" flag 🤫

Warnings and errors will still be printed. safety first, bestie 🛟

• --no-pager — disable the pager 🚫📄
• --config <NAME=VALUE> — additional configuration options (can be repeated)

The name should be specified as TOML dotted keys. The value should be specified as a TOML expression. If string value isn't enclosed by any TOML constructs (such as array notation), quotes can be omitted. so you can be a little loose with the quotes, slay ✨

• --config-file <PATH> — additional configuration files (can be repeated) 📂

---

and that's the whole page, bestie. it's jj-resolve(1) from the General Commands Manual, and the footer is literally just resolve and jj-resolve(1) — so that's the source/version vibe and the command name all wrapped up. go forth and merge, you absolute icon 👑💖