From 49b86e694b3ce6623c23d1ca501fccad4ab1d3a3 Mon Sep 17 00:00:00 2001 From: Agam Agarwal Date: Mon, 14 Sep 2026 23:45:21 +0530 Subject: [PATCH] jj-converge: add page (#23996) --- pages/common/jj-converge.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 pages/common/jj-converge.md diff --git a/pages/common/jj-converge.md b/pages/common/jj-converge.md new file mode 100644 index 0000000000..bc47dfafcd --- /dev/null +++ b/pages/common/jj-converge.md @@ -0,0 +1,17 @@ +# jj converge + +> Converge divergent changes. +> Attempts to resolve divergence by replacing two or more visible revisions for a given change with a single revision. +> More information: . + +- Converge divergent revisions in the default search space (configured by `revsets.converge`): + +`jj converge` + +- Converge divergent revisions within a specific search space: + +`jj converge {{[-r|--revision]}} {{revset}}` + +- Resolve divergence without interactive prompts: + +`jj converge --no-interactive`