{"thread":{"id":"65012","subject":"rebase --abort had issues","startedAt":"2026-02-18T12:05:26Z","lastAt":"2026-02-18T13:32:52Z","messageCount":3,"participants":["Cary Reams","Kristoffer Haugsbakk"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"536275","messageId":"CALT4vkh_t35eJ8oWkSokVzt4mj+cZYxPQCr=gtU5hEuA0v1baA@mail.gmail.com","threadId":"65012","inReplyTo":null,"subject":"rebase --abort had issues","fromName":"Cary Reams","fromEmail":"cary.reams@gmail.com","sentAt":"2026-02-18T12:05:13Z","receivedAt":"2026-02-18T12:05:26Z","isPatch":false,"sender":{"key":"cary.reams@gmail.com","avatar":null},"body":"wont be a lot to go on, but here goes. Apologies, I don't have a\nprecise timeline for you,\nas its all running together mixed with a nontrivial amount of adrenaline.\n\nwhile attempting a rebase, made it to commit 7 of 18, when received message\nabout segmentation fault and inability to parse the file experiencing\nthe merge conflict\n\nfixed the file as per normal\nadded the file\nrebase --continue failed\nrebase --abort failed\nrepo seemed to be stuck in the middle of the commit\nwould permit checkout of other branches, but still displayed the\ninterim rebase status report\n\nAt more than one juncture I received this message:\n\nfatal: Unable to create '...MERGE_RR.lock': File exists.\n\nAnother git process seems to be running in this repository, e.g.\nan editor opened by 'git commit'. Please make sure all processes\nare terminated then try again. If it still fails, a git process\nmay have crashed in this repository earlier:\n\nHowever, after removing MERGE_RR.lock and attempting rebase --continue\nor --abort (I don't recall which), I received the simple segmentation fault\nresponse with no other messaging.\n\n\nw/r/t to state of the compromised repo, I have been able to checkout\nmultiple branches\nI have under development and move them to a fresh repo clone (init\nfrom backup). However, every\nstatus command responds as if the rebase is still in play, regardless of branch:\n\nOn branch <any>\nLast commands done (7 commands done):\n   pick 6c706e0f5 refactors endpoints to include element-delimiting comma\n   pick 0373d1796 #1680 interim save to do research\n  (see more in file .git/rebase-merge/done)\nNext commands to do (11 remaining commands):\n   drop 5e3a99f46 fixes 0-day enabling facilitator to edit their org data\n   drop 428947142 #1680 creates facGroupInvoiceCreate template\n  (use \"git rebase --edit-todo\" to view and edit)\nYou are currently editing a commit while rebasing branch\n'wip_i1680_pass1' on '85bcb9270'.\n  (use \"git commit --amend\" to amend the current commit)\n  (use \"git rebase --continue\" once you are satisfied with your changes)\n\nnothing to commit, working tree clean\n\nBegan rebuilding a new copy of my repo. Once I finished getting my\nfiles transferred,\nI attempted to get precise error messages and detail for this report.\n\nthe status message is as above\nchecked out the branch I was attempting to rebase\nrebase --continue failed,\nrebase --abort did not fail\nand status no longer displays the interim rebase update messages\n\nnot sure what to think, now.\n\nself-healing ??\n\nThanks for reading, apologies its not more precise.\n"},{"id":"536279","messageId":"ec016470-ecd6-49c4-b9cd-95cc89112050@app.fastmail.com","threadId":"65012","inReplyTo":"CALT4vkh_t35eJ8oWkSokVzt4mj+cZYxPQCr=gtU5hEuA0v1baA@mail.gmail.com","subject":"Re: rebase --abort had issues","fromName":"Kristoffer Haugsbakk","fromEmail":"kristofferhaugsbakk@fastmail.com","sentAt":"2026-02-18T13:30:15Z","receivedAt":"2026-02-18T13:30:36Z","isPatch":false,"sender":{"key":"kristofferhaugsbakk@fastmail.com","avatar":null},"body":"On Wed, Feb 18, 2026, at 13:05, Cary Reams wrote:\n> wont be a lot to go on, but here goes. Apologies, I don't have a\n> precise timeline for you,\n> as its all running together mixed with a nontrivial amount of adrenaline.\n>\n> while attempting a rebase, made it to commit 7 of 18, when received message\n> about segmentation fault and inability to parse the file experiencing\n> the merge conflict\n>\n> fixed the file as per normal\n> added the file\n> rebase --continue failed\n> rebase --abort failed\n> repo seemed to be stuck in the middle of the commit\n> would permit checkout of other branches, but still displayed the\n> interim rebase status report\n>\n> At more than one juncture I received this message:\n>\n> fatal: Unable to create '...MERGE_RR.lock': File exists.\n>\n> Another git process seems to be running in this repository, e.g.\n> an editor opened by 'git commit'. Please make sure all processes\n> are terminated then try again. If it still fails, a git process\n> may have crashed in this repository earlier:\n>\n> However, after removing MERGE_RR.lock and attempting rebase --continue\n> or --abort (I don't recall which), I received the simple segmentation fault\n> response with no other messaging.\n>\n>\n> w/r/t to state of the compromised repo, I have been able to checkout\n> multiple branches\n> I have under development and move them to a fresh repo clone (init\n> from backup). However, every\n> status command responds as if the rebase is still in play, regardless of branch:\n>\n> On branch <any>\n> Last commands done (7 commands done):\n>    pick 6c706e0f5 refactors endpoints to include element-delimiting comma\n>    pick 0373d1796 #1680 interim save to do research\n>   (see more in file .git/rebase-merge/done)\n> Next commands to do (11 remaining commands):\n>    drop 5e3a99f46 fixes 0-day enabling facilitator to edit their org data\n>    drop 428947142 #1680 creates facGroupInvoiceCreate template\n>   (use \"git rebase --edit-todo\" to view and edit)\n> You are currently editing a commit while rebasing branch\n> 'wip_i1680_pass1' on '85bcb9270'.\n>   (use \"git commit --amend\" to amend the current commit)\n>   (use \"git rebase --continue\" once you are satisfied with your changes)\n>\n> nothing to commit, working tree clean\n>\n> Began rebuilding a new copy of my repo. Once I finished getting my\n> files transferred,\n> I attempted to get precise error messages and detail for this report.\n>\n> the status message is as above\n> checked out the branch I was attempting to rebase\n> rebase --continue failed,\n> rebase --abort did not fail\n> and status no longer displays the interim rebase update messages\n>\n> not sure what to think, now.\n>\n> self-healing ??\n\nWhat Git version?\n\nYou can also run `git bugreport` and just use the generated information\nat the end.\n"},{"id":"536280","messageId":"CALT4vkiciQP1AYs7m9cwrqJMGtvm128gnog52Z1XjrG9xrzTUQ@mail.gmail.com","threadId":"65012","inReplyTo":"ec016470-ecd6-49c4-b9cd-95cc89112050@app.fastmail.com","subject":"Re: rebase --abort had issues","fromName":"Cary Reams","fromEmail":"cary.reams@gmail.com","sentAt":"2026-02-18T13:32:39Z","receivedAt":"2026-02-18T13:32:52Z","isPatch":false,"sender":{"key":"cary.reams@gmail.com","avatar":null},"body":"[System Info]\ngit version:\ngit version 2.34.1\ncpu: x86_64\nno commit associated with this build\nsizeof-long: 8\nsizeof-size_t: 8\nshell-path: /bin/sh\nuname: Linux 6.8.0-94-generic #96~22.04.1-Ubuntu SMP PREEMPT_DYNAMIC\nFri Jan 16 13:19:05 UTC 2 x86_64\ncompiler info: gnuc: 11.4\nlibc info: glibc: 2.35\n$SHELL (typically, interactive shell): /bin/bash\n\n\n[Enabled Hooks]\npost-checkout\npre-push\n\nOn Wed, Feb 18, 2026 at 8:30 AM Kristoffer Haugsbakk\n<kristofferhaugsbakk@fastmail.com> wrote:\n>\n> On Wed, Feb 18, 2026, at 13:05, Cary Reams wrote:\n> > wont be a lot to go on, but here goes. Apologies, I don't have a\n> > precise timeline for you,\n> > as its all running together mixed with a nontrivial amount of adrenaline.\n> >\n> > while attempting a rebase, made it to commit 7 of 18, when received message\n> > about segmentation fault and inability to parse the file experiencing\n> > the merge conflict\n> >\n> > fixed the file as per normal\n> > added the file\n> > rebase --continue failed\n> > rebase --abort failed\n> > repo seemed to be stuck in the middle of the commit\n> > would permit checkout of other branches, but still displayed the\n> > interim rebase status report\n> >\n> > At more than one juncture I received this message:\n> >\n> > fatal: Unable to create '...MERGE_RR.lock': File exists.\n> >\n> > Another git process seems to be running in this repository, e.g.\n> > an editor opened by 'git commit'. Please make sure all processes\n> > are terminated then try again. If it still fails, a git process\n> > may have crashed in this repository earlier:\n> >\n> > However, after removing MERGE_RR.lock and attempting rebase --continue\n> > or --abort (I don't recall which), I received the simple segmentation fault\n> > response with no other messaging.\n> >\n> >\n> > w/r/t to state of the compromised repo, I have been able to checkout\n> > multiple branches\n> > I have under development and move them to a fresh repo clone (init\n> > from backup). However, every\n> > status command responds as if the rebase is still in play, regardless of branch:\n> >\n> > On branch <any>\n> > Last commands done (7 commands done):\n> >    pick 6c706e0f5 refactors endpoints to include element-delimiting comma\n> >    pick 0373d1796 #1680 interim save to do research\n> >   (see more in file .git/rebase-merge/done)\n> > Next commands to do (11 remaining commands):\n> >    drop 5e3a99f46 fixes 0-day enabling facilitator to edit their org data\n> >    drop 428947142 #1680 creates facGroupInvoiceCreate template\n> >   (use \"git rebase --edit-todo\" to view and edit)\n> > You are currently editing a commit while rebasing branch\n> > 'wip_i1680_pass1' on '85bcb9270'.\n> >   (use \"git commit --amend\" to amend the current commit)\n> >   (use \"git rebase --continue\" once you are satisfied with your changes)\n> >\n> > nothing to commit, working tree clean\n> >\n> > Began rebuilding a new copy of my repo. Once I finished getting my\n> > files transferred,\n> > I attempted to get precise error messages and detail for this report.\n> >\n> > the status message is as above\n> > checked out the branch I was attempting to rebase\n> > rebase --continue failed,\n> > rebase --abort did not fail\n> > and status no longer displays the interim rebase update messages\n> >\n> > not sure what to think, now.\n> >\n> > self-healing ??\n>\n> What Git version?\n>\n> You can also run `git bugreport` and just use the generated information\n> at the end.\n"}]}