Can't rebase on worktrees

Support Bug Reports
1

Describe the Bug

Rebase says commit instead of continue when I work in a separate worktree. Even if I do git rebase --continue in the terminal it still gets stuck. Just seems like worktrees arent very well supported here.

Steps to Reproduce

Make a new worktree, open both the main tree and the new tree in separate terminals. Try rebasing on the new worktree.

Expected Behavior

That you can rebase normally. Rebasing in general is honestly kinda messed up in cursor

Operating System

MacOS

Version Information

Latest verison

Does this stop you from using Cursor

Sometimes - I can sometimes use Cursor

3

Hey, thanks for the report. I need a bit more info to figure this out:

  1. Can you share your exact Cursor version? (Menu → About Cursor → Copy)
  2. Are you using Cursor’s built-in Parallel Agent worktrees, or manual git worktrees opened in separate windows?
  3. When you say “rebase suggests commit instead of continue”, is that in the Source Control UI or in the terminal? A screenshot would really help.
  4. When it gets stuck on git rebase --continue, what exact output do you see?

There are known issues with git rebase and Cursor background git operations that can interfere, so knowing your exact setup will help narrow it down.

4

image
image418Ă—404 21.3 KB

It just looks like this. Pretty normal except im in the middle of a rebase so it should say continue.

It might’ve been fixed in the latest version though. I just rebased and it was fine though it could’ve been a fluke. I’m using manual git worktrees.

Version: 2.5.20 (Universal)
VSCode Version: 1.105.1
Commit: 511523af765daeb1fa69500ab0df5b6524424610
Date: 2026-02-19T20:41:31.942Z
Build Type: Stable
Release Track: Default
Electron: 39.4.0
Chromium: 142.0.7444.265
Node.js: 22.22.0
V8: 14.2.231.22-electron.0
OS: Darwin arm64 23.6.0

1 Like
5

Just discovered its not fixed. What happens is that if you press commit, you get stuck. If you do git rebase —continue:

You get this error:

Screenshot 2026-02-23 at 7.03.55 PM
Screenshot 2026-02-23 at 7.03.55 PM1632Ă—448 48.2 KB

6

Hey, thanks for the follow-up and the screenshots. They’re really helpful. Now I can clearly see both issues.

“Commit” button instead of “Continue”

This is a bug. The Source Control panel isn’t detecting a rebase-in-progress state in your worktree.

Vim swap-file error (E325)

Cursor’s background Git operations are interfering with the rebase process. Workarounds:

  1. Skip Vim when continuing the rebase:

    git commit --no-edit && git rebase --continue

    If that doesn’t work:

    git -c core.editor=true rebase --continue

    If that still fails with “Aborting commit due to empty commit message” (this can happen when the commit message starts with #):

    git -c core.commentChar=@ -c core.editor=true rebase --continue

  2. Temporarily disable background Git auto-refresh during the rebase. Add this to your settings (Cmd+Shift+P > “Open User Settings JSON”):

    "git.autorefresh": false

    Don’t forget to turn it back on after you finish the rebase.

  3. Permanently replace Vim with Cursor for Git operations:

    git config --global core.editor "cursor --wait"

  4. If the swap file is already stuck:

    find .git -name "*.swp" -delete

Let me know if this helped, or if the issue still happens even with git.autorefresh disabled.

7

Thanks for the suggestion. I’ve noticed another issue. Using Cursor to help you merge can cause the file to be unsaveable, as in, the IDE won’t let you save your changes. Unsure of what’s causing it. The complete merge button often disappears as well, which is honestly my biggest issue. It makes the whole UI kind of pointless.

8

Hey, thanks for flagging these new issues.

For the file becoming unsaveable and the “Complete Merge” button disappearing, I’d like to dig into this, but I need a bit more detail:

  • When you say the file is “unsaveable”, does Cmd+S do nothing, or do you get an error message? Do you see anything in the Output panel (View > Output > Git)?
  • For the disappearing “Complete Merge” button, does it vanish after a certain action like editing a file or switching tabs, or is it missing from the start?
  • Can you share your current Cursor version? (Help > About Cursor > Copy)
  • Screenshots of both issues would be really helpful if you can catch them next time.

In the meantime, for the rebase workarounds from my earlier post, did any of those help, or is the issue still happening?

9

Yes, CTRL + S does not work. It throws out an error saying the file cannot be saved. I’ll try to get a screenshot if I encounter it again.

Version: 2.5.26

VSCode Version: 1.105.1

Commit: 7d96c2a03bb088ad367615e9da1a3fe20fbbc6a0

Date: 2026-02-26T04:57:56.825Z (3 days ago)

Build Type: Stable

Release Track: Default

Electron: 39.4.0

Chromium: 142.0.7444.265

Node.js: 22.22.0

V8: 14.2.231.22-electron.0

OS: Darwin arm64 24.6.0

Cursor might’ve auto updated since I encountered the issue. I can’t confirm whether your fix worked since I’ve been using the chat to help rebase. I will attempt your solution next time since the chat isn’t working out too well for me either as I have mentioned here.

1 Like