Sublime Forum

Cannot perform huge rebase in Sublime Merge 2074

#1

Hi,

While attempting a “huge” rebase (75 files, 3000 changes) of a Git repository I get the following error:

fatal: Unable to create '/REDACTED/.git/index.lock': File exists.

Another git process seems to be running in this repository, e.g.
an editor opened by 'git commit'. Please make sure all processes
are terminated then try again. If it still fails, a git process
may have crashed in this repository earlier:
remove the file manually to continue.

The same operation works flawlessly in Git CLI.

0 Likes
#2

Hopefully useful questions for the devs:

  1. can you confirm there were no other git operations in progress from your side?
  2. how many commits are involved in this rebase?
  3. how long does it take to fail?
  4. are there multiple entries in the command history? (the [>✓] or [>✕] icon left of the branch name)
  5. I see the repo is REDACTED, have you seen this issue in a public repo or know of any reproduction steps?
0 Likes
#3
  1. Yup! I only have ST and SM running.
  2. I can reproduce the issue with two commits separated by 6 commits.
  3. A few seconds. It shows “Running commands…” then it fails.
  4. Yes.
  5. Unfortunately this is a private repo that I can’t share here. I tried creating a reproducer Git repo from scratch but I can’t get it to fail :confused: Is there any debug information I can provide to help identify the bug?

As a side note, I’d like to add that the issue seems to occur randomly (I sometime manage to have the squash working). Perhaps a race condition issue?

0 Likes
#4

Help > Debug Information could possibly shed some light on something; it gives you an insight into what Merge thinks the current state of things is.

I can say that I fairly regularly do much, much larger rebases than the one you’re talking about here without any issues; generally speaking there are usually so many files and so many changes that Merge just nopes out and the panel says there’s too much information to display a summary (side note: not a fan of the monorepo culture :smiley:).

Based on that my guess would be that it’s perhaps something specific to the repo in question (contents of a git hook perhaps?) or maybe there is some otherwise unexpected operation happening in the repo in another git client or something?

0 Likes