jj-converge(1)

Welcome to this page, bestie — it’s jj-converge(1) from the General Commands Manual, and it’s literally here to help you converge divergent changes. Slay. 💅

💖 NAME 💖

jj-converge — Converge divergent changes

🌈 SYNOPSIS 🌈

jj converge [-r|--revision] [-R|--repository] [--ignore-working-copy]
[--no-interactive] [--no-integrate-operation] [--ignore-immutable]
[--at-operation] [--debug] [--color] [--quiet] [--no-pager] [--config]
[--config-file] [-h|--help]

✨ DESCRIPTION ✨

Okay so the whole vibe of jj converge is: try to resolve divergence by replacing two or more visible revisions for a given change with a single revision. It evaluates the revset(s) given by the --revisions arg — or the revsets.converge setting if you didn’t specify any — and groups the resulting revisions by change ID. Change IDs with more than one revision are, by definition, divergent. No cap.

If there’s no divergence, it returns successfully. If there’s more than one divergent change, it prompts the user to choose one. Then the command applies heuristics to try to automatically come up with a good solution (i.e. a new revision) that replaces the divergent revisions. If the heuristics are inconclusive, jj converge falls back to prompting the user. Use --no-interactive to print a warning instead of prompting the user.

The user may be prompted for any of the following: to merge revision descriptions, to choose parents for the solution, and/or (very rarely) to choose a revision author.

When a solution is found, the new revision replaces the divergent revisions of the specific change ID — but only those matching the revsets. If there are other visible revisions for the same change ID outside the revset, those will remain, and you’ll still have divergence, though it will be reduced. Descendants of the divergent revisions are rebased onto the solution, and local bookmarks pointing to any divergent revision are updated to point to the solution.

Note: there may be file conflicts in the solution whether or not there were conflicts to begin with. 😭

The modifications made by jj converge can be reviewed by jj op show -p. You can inspect the change evolution with jj evolog. If you’re not satisfied with the result, you can run jj undo.

🎀 OPTIONS 🎀

• -r, --revision <REVSETS> — The search space to look for divergent revisions. If no revisions are specified, this defaults to the revsets.converge setting.
• --no-interactive — Do not prompt the user for help resolving divergence. If the command cannot solve divergence automatically, it will print a warning and exit without making any changes (divergence will still be present).
• -h, --help — Print help (see a summary with -h).

👑 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.
• --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.

Loading the repository at a specific operation with --at-operation implies --ignore-working-copy.

• --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.

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.

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

• --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.

This option only affects the check. It does not affect the immutable_heads() revset or the immutable template keyword.

• --at-operation <AT_OPERATION> — 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.

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.

Use jj op log to find the operation ID you want. Any unambiguous prefix of the operation ID is enough.

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

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.

• --debug — Enable debug logging.
• --color <WHEN> — When to colorize output. Possible values:
  • always
  • never
  • debug
  • auto
• --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.

Warnings and errors will still be printed.

• --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.
• --config-file <PATH> — Additional configuration files (can be repeated).

---

That’s the whole page, bestie! 💖 The footer on this one says converge and jj-converge(1) — that’s the source/version + manual name vibes; no extra date is shown here, so I’m not inventing one. Go forth and converge, icon. ✨