From b10b8784003daed540793dd0169b5ce3472fc68c Mon Sep 17 00:00:00 2001
From: Michael Bahr <michael.bahr@sourcegraph.com>
Date: Fri, 28 Mar 2025 14:54:49 +0100
Subject: [PATCH 1/2] docs: changeset rebasing

---
 docs/batch-changes/rebasing-changesets.mdx | 36 ++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 docs/batch-changes/rebasing-changesets.mdx

diff --git a/docs/batch-changes/rebasing-changesets.mdx b/docs/batch-changes/rebasing-changesets.mdx
new file mode 100644
index 000000000..ed2c38446
--- /dev/null
+++ b/docs/batch-changes/rebasing-changesets.mdx
@@ -0,0 +1,36 @@
+# Rebasing changesets
+
+<p className="subtitle">Learn how to rebase your existing changesets.</p>
+
+<Callout type="note">This feature is supported for Sourcegraph versions 6.2 or more.</Callout>
+
+If your codehost requires changesets to be up to date with the main branch, you can use the rebase functionality of the Web UI to update the changesets.
+
+<Callout type="warning">Rebasing does not resolve merge conflicts.</Callout>
+
+## Requirements
+
+- Sourcegraph instance with repositories in it. See the [Quickstart](/#quick-install) guide on how to set up a Sourcegraph instance
+- A [global service account token](/batch-changes/configuring-credentials#global-service-account-tokens) for Batch Changes (**a personal access token cannot currently be used for importing changesets**)
+
+## Select changesets to rebase
+
+After navigating to the changesets of your batch change, select one or more **published** changesets to rebase. You can only rebase changesets after they have been published to the codehost.
+
+![List of changesets with two of them selected](https://storage.googleapis.com/sourcegraph-assets/docs/images/batch_changes/2025/rebase_changesets.png)
+
+If a changeset is already up to date with the main branch, rebasing will result in no changes.
+
+## Start the rebase bulk operation
+
+With all applicable changesets selected, click the **Select action** button, and then select **Rebase changesets**.
+
+![List of changesets and dropdown overlay](https://storage.googleapis.com/sourcegraph-assets/docs/images/batch_changes/2025/rebase_dropdown.png)
+
+Confirm the popup to start the rebase bulk operation.
+
+![Popup to confirm rebase action](https://storage.googleapis.com/sourcegraph-assets/docs/images/batch_changes/2025/rebase_confirm.png)
+
+You can see the progress of the rebase operation in the **Bulk Actions** tab.
+
+![List of bulk operations showing that rebase has completed](https://storage.googleapis.com/sourcegraph-assets/docs/images/batch_changes/2025/rebase_status.png)

From 53095610a81a1b66da436ef785657cbc4230ff1c Mon Sep 17 00:00:00 2001
From: Michael Bahr <michael.bahr@sourcegraph.com>
Date: Fri, 28 Mar 2025 14:57:07 +0100
Subject: [PATCH 2/2] nav

---
 src/data/navigation.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/data/navigation.ts b/src/data/navigation.ts
index 2a9ad624e..52b5d3d33 100644
--- a/src/data/navigation.ts
+++ b/src/data/navigation.ts
@@ -151,6 +151,7 @@ export const navigation: NavigationItem[] = [
 						subsections: [
 							{ title: "Publishing Changesets", href: "/batch-changes/publishing-changesets", },
 							{ title: "Tracking Changesets", href: "/batch-changes/tracking-existing-changesets", },
+							{ title: "Rebasing Changesets", href: "/batch-changes/rebasing-changesets", },
 						]
 					},
 					{