git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: rebase --abort had issues

From
CRCary Reams <cary.reams@gmail.com>
Date
Feb 18, 2026, 13:32 UTC
Message-ID
<CALT4vkiciQP1AYs7m9cwrqJMGtvm128gnog52Z1XjrG9xrzTUQ@mail.gmail.com>
In-Reply-To
<ec016470-ecd6-49c4-b9cd-95cc89112050@app.fastmail.com>

[System Info] git version: git version 2.34.1 cpu: x86_64 no commit associated with this build sizeof-long: 8 sizeof-size_t: 8 shell-path: /bin/sh uname: Linux 6.8.0-94-generic #96~22.04.1-Ubuntu SMP PREEMPT_DYNAMIC Fri Jan 16 13:19:05 UTC 2 x86_64 compiler info: gnuc: 11.4 libc info: glibc: 2.35 $SHELL (typically, interactive shell): /bin/bash

[Enabled Hooks] post-checkout pre-push

On Wed, Feb 18, 2026 at 8:30 AM Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com> wrote:

Show 72 quoted lines
>
> On Wed, Feb 18, 2026, at 13:05, Cary Reams wrote:
> > wont be a lot to go on, but here goes. Apologies, I don't have a
> > precise timeline for you,
> > as its all running together mixed with a nontrivial amount of adrenaline.
> >
> > while attempting a rebase, made it to commit 7 of 18, when received message
> > about segmentation fault and inability to parse the file experiencing
> > the merge conflict
> >
> > fixed the file as per normal
> > added the file
> > rebase --continue failed
> > rebase --abort failed
> > repo seemed to be stuck in the middle of the commit
> > would permit checkout of other branches, but still displayed the
> > interim rebase status report
> >
> > At more than one juncture I received this message:
> >
> > fatal: Unable to create '...MERGE_RR.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:
> >
> > However, after removing MERGE_RR.lock and attempting rebase --continue
> > or --abort (I don't recall which), I received the simple segmentation fault
> > response with no other messaging.
> >
> >
> > w/r/t to state of the compromised repo, I have been able to checkout
> > multiple branches
> > I have under development and move them to a fresh repo clone (init
> > from backup). However, every
> > status command responds as if the rebase is still in play, regardless of branch:
> >
> > On branch <any>
> > Last commands done (7 commands done):
> >    pick 6c706e0f5 refactors endpoints to include element-delimiting comma
> >    pick 0373d1796 #1680 interim save to do research
> >   (see more in file .git/rebase-merge/done)
> > Next commands to do (11 remaining commands):
> >    drop 5e3a99f46 fixes 0-day enabling facilitator to edit their org data
> >    drop 428947142 #1680 creates facGroupInvoiceCreate template
> >   (use "git rebase --edit-todo" to view and edit)
> > You are currently editing a commit while rebasing branch
> > 'wip_i1680_pass1' on '85bcb9270'.
> >   (use "git commit --amend" to amend the current commit)
> >   (use "git rebase --continue" once you are satisfied with your changes)
> >
> > nothing to commit, working tree clean
> >
> > Began rebuilding a new copy of my repo. Once I finished getting my
> > files transferred,
> > I attempted to get precise error messages and detail for this report.
> >
> > the status message is as above
> > checked out the branch I was attempting to rebase
> > rebase --continue failed,
> > rebase --abort did not fail
> > and status no longer displays the interim rebase update messages
> >
> > not sure what to think, now.
> >
> > self-healing ??
>
> What Git version?
>
> You can also run `git bugreport` and just use the generated information
> at the end.
Previous: Kristoffer Haugsbakk
Message 3 of 3 in “rebase --abort had issues”
  1. Cary ReamsFeb 18, 2026
  2. Kristoffer HaugsbakkFeb 18, 2026
  3. Cary ReamsFeb 18, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.