Skip to Content
Git OperationsRebase

Rebase a Worktree

Rebase is useful when a feature branch must be updated onto the latest target branch while keeping a linear history.

Rebase dialog showing the source worktree and target branch

Run a rebase safely

  1. Select the worktree whose current branch will be rewritten.
  2. Open Rebase and choose the new base branch.
  3. Verify the current branch and selected base.
  4. Commit or stash unrelated changes before confirming.
  5. Start the rebase.

A rebase rewrites commit IDs. Avoid rebasing commits that other people already consume unless your team has agreed on the force-push and recovery process.

Resolve conflicts

If Git pauses on conflicts, WorktreeWise keeps the rebase in progress and lists every conflicted file. For each file, choose whether to keep the Source version (the commit being replayed) or the Target version (the branch being rebased onto). Continue rebase becomes available after all listed conflicts are resolved. Choose Abort rebase to restore the source branch instead.

MergeCherry-pick