Skip to content

Commit 5c8e732

Browse files
authored
docs: rebase changesets (#1050)
Updating the docs for the new changeset rebase functionality @MaedahBatool: Would you take this PR and merge it into the 6.2 branch
1 parent 26032a4 commit 5c8e732

File tree

2 files changed

+37
-0
lines changed

2 files changed

+37
-0
lines changed
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# Rebasing changesets
2+
3+
<p className="subtitle">Learn how to rebase your existing changesets.</p>
4+
5+
<Callout type="note">This feature is supported for Sourcegraph versions 6.2 or more.</Callout>
6+
7+
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.
8+
9+
<Callout type="warning">Rebasing does not resolve merge conflicts.</Callout>
10+
11+
## Requirements
12+
13+
- Sourcegraph instance with repositories in it. See the [Quickstart](/#quick-install) guide on how to set up a Sourcegraph instance
14+
- 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**)
15+
16+
## Select changesets to rebase
17+
18+
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.
19+
20+
![List of changesets with two of them selected](https://storage.googleapis.com/sourcegraph-assets/docs/images/batch_changes/2025/rebase_changesets.png)
21+
22+
If a changeset is already up to date with the main branch, rebasing will result in no changes.
23+
24+
## Start the rebase bulk operation
25+
26+
With all applicable changesets selected, click the **Select action** button, and then select **Rebase changesets**.
27+
28+
![List of changesets and dropdown overlay](https://storage.googleapis.com/sourcegraph-assets/docs/images/batch_changes/2025/rebase_dropdown.png)
29+
30+
Confirm the popup to start the rebase bulk operation.
31+
32+
![Popup to confirm rebase action](https://storage.googleapis.com/sourcegraph-assets/docs/images/batch_changes/2025/rebase_confirm.png)
33+
34+
You can see the progress of the rebase operation in the **Bulk Actions** tab.
35+
36+
![List of bulk operations showing that rebase has completed](https://storage.googleapis.com/sourcegraph-assets/docs/images/batch_changes/2025/rebase_status.png)

src/data/navigation.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ export const navigation: NavigationItem[] = [
151151
subsections: [
152152
{ title: "Publishing Changesets", href: "/batch-changes/publishing-changesets", },
153153
{ title: "Tracking Changesets", href: "/batch-changes/tracking-existing-changesets", },
154+
{ title: "Rebasing Changesets", href: "/batch-changes/rebasing-changesets", },
154155
]
155156
},
156157
{

0 commit comments

Comments
 (0)