Cannot squash commits during interactive rebasing

XMLWordPrintable

    • Type: Bug
    • Resolution: Unresolved
    • Priority: Low
    • None
    • Affects Version/s: 3.4.22
    • Component/s: General
    • None
    • Severity 2 - Major

      I often get the following error when trying to squash commits during interactive rebasing:

       

      git -c diff.mnemonicprefix=false -c core.quotepath=false --no-optional-locks -c sequence.editor='C:\Users\tla\AppData\Local\SourceTree\app-3.4.22\tools\stree_gri' -c core.editor='C:\Users\tla\AppData\Local\SourceTree\app-3.4.22\tools\stree_gri' rebase -i --autosquash bb084def5150549d9270e55db98c2c3ca1e9affc
      Rebasing (4/12)
      [detached HEAD f65c6f79] SW-113
       Date: Tue Mar 11 15:57:32 2025 +0200
       33 files changed, 604 insertions(+), 282 deletions(-)
       create mode 100644 exe/Inc_s4f4/gnu/CMakeLists.txt
       create mode 100644 exe/Inc_s4f4/iar/CMakeLists.txt
       create mode 100644 pT/blocks/Src/Ch/CMakeLists.txt
       create mode 100644 pT/blocks/Src/Cm/CMakeLists.txt
       create mode 100644 pT/blocks/Src/Gu/CMakeLists.txt
       create mode 100644 pT/blocks/Src/Me/CMakeLists.txt
       create mode 100644 pT/blocks/Src/Nf/CMakeLists.txt
       create mode 100644 pT/blocks/Src/Pu/CMakeLists.txt
       create mode 100644 pT/blocks/Src/Ra/CMakeLists.txt
       create mode 100644 pT/blocks/Src/Re/CMakeLists.txt
       create mode 100644 pT/blocks/Src/Su/CMakeLists.txt
       create mode 100644 pT/blocks/Src/Tu/CMakeLists.txt
       create mode 100644 pT/blocks/Src/bs/CMakeLists.txt
       create mode 100644 pT/blocks/Src/fw/CMakeLists.txt
       create mode 100644 pT/blocks/Src/gp/CMakeLists.txt
       create mode 100644 pT/blocks/Src/gup/CMakeLists.txt
      Rebasing (5/12)
      error: Unable to create 'C:/Projects/myproj/.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 only instances of git.exe are the ones SourceTree starts. It seems to be running at least 5 instances of git.ext during the interactive rebasing.

      The index.lock file only exists temporarily during the interactive rebasing. It disappears by itself when the operation is done.

      The error seems to happen more often when I have many commits in my branch. It happens every time if I have about ten commits or more in the branch.

            Assignee:
            Mukesh Kumar (Inactive)
            Reporter:
            Ari Suomi
            Votes:
            0 Vote for this issue
            Watchers:
            2 Start watching this issue

              Created:
              Updated: