Git add failed: exit code 128 (solved by itself)

[UnconventionalMindset]

After selecting 1 of the two version available for a conflict, I pressed the stage button for the current file. I received the error code, so I started clicking continuosly (like every user would do u.u) until it solved by itself after 20 error messages (who needs bug fixing when you just click 20 times to solve the error?). Let me know what you think!

[smashwilson]

Nuts. I hadn't seen this one for a long time, so I was speculating that it had been fixed upstream, but I suppose not! The original issue was #96, but I'll keep this one open.

[UnconventionalMindset]

Ok! Thank you @smashwilson. I'm using Atom 1.0.2 on OS X Yosemite 10.10.4 (14E46) if that can help

[danqing]

Just saw this and unfortunately it didn't solve itself for me... O.O

[UnconventionalMindset]

Just happened again. I confirm that If you press stage button more times with a delay of 1-2 seconds it's working after a while... D:

[wolfgang42]

I'm also seeing this occasionally. Once I'm done merging a file it offers to stage; when I click the stage button I get this message. The dialog stays up and if I click stage again it works fine.

[zwacky]

also happens every time for me.

[art-divin]

This has been happening for me as well, but once I started to save file before trying to stage it from merge-conflicts popup, I was able to workaround this issue.

Probably the problem is that I have code formatter attached to "save" event. When pressing "stage" button from the aforementioned popup, it always shows "128" error code. But if to separate formatting of the code (pressing CMD+S) from "Stage" event - then everything works OK.

[martimatix]

+1

[pietrovismara]

+1

[numaanashraf]

+1

[hamishtaplin]

+1

[exwar]

+1 Happens every time for me

[p-j]

+1 first time using the merge conflicts plugin, first file processed entirely, impossible to stage.

[simonlayfield]

+1

I've noticed that if I click 'Maybe Later' in the dialog prompt, then click 'Stage' button in the list of conflicts I don't get this error.

[wundo]

+1

[smashwilson]

I have a potential fix that'll be included in the next release (1.3.7). Once that's out, I'd appreciate it if those of you who can reproduce reliably can let me know if you still see this! (I'm planning to push it in the next hour or so.)

[martimatix]

@smashwilson It's working for me now. Thanks for the fix! :+1:

Edit: it was happening every single time for me prior to 1.3.7

[smashwilson]

Nice! This one's been bugging me for forever, and it only repros for me very, very occasionally.

@exwar You mentioned that it happened every single time for you - if you get a chance, would you mind trying 1.3.7 and seeing if it's still cropping up?

[smashwilson]

Nuts - if #193 is any indication, there's still a way this one can happen. :rage:

At least I've fixed it for some of you!

[UnconventionalMindset]

Anyway, it worked immediately this time for me! I hope you will be able to fix the other issue...

[sriharshakappala]

Happening on clicking Stage button after resolving a conflict!

Atom Version: 1.1.0 System: Ubuntu 14.04.3 Thrown From: merge-conflicts package, v1.3.7

Stack Trace

Uncaught Error: The index is locked. This might be due to a concurrent or crashed process

At /home/harsha/.atom/packages/merge-conflicts/lib/git-bridge.coffee:250

Error: The index is locked. This might be due to a concurrent or crashed process
  at Error (native)
  at Function.GitBridge.add (/home/harsha/.atom/packages/merge-conflicts/lib/git-bridge.coffee:189:15)
  at ResolverView.resolve (/home/harsha/.atom/packages/merge-conflicts/lib/view/resolver-view.coffee:61:15)
  at HTMLButtonElement.<anonymous> (/usr/share/atom/resources/app.asar/node_modules/atom-space-pen-views/node_modules/space-pen/lib/space-pen.js:220:36)
  at HTMLButtonElement.jQuery.event.dispatch (/usr/share/atom/resources/app.asar/node_modules/jquery/dist/jquery.js:4435:9)
  at HTMLButtonElement.elemData.handle (/usr/share/atom/resources/app.asar/node_modules/jquery/dist/jquery.js:4121:28)

Commands

     -0:38.2.0 editor:move-to-end-of-screen-line (atom-text-editor.editor.is-focused)
     -0:37.8.0 editor:select-to-beginning-of-word (atom-text-editor.editor.is-focused)
     -0:37.6.0 editor:select-to-end-of-word (atom-text-editor.editor.is-focused)
     -0:37.2.0 core:delete (atom-text-editor.editor.is-focused)
  2x -0:36.8.0 core:save (atom-text-editor.editor.is-focused)
  3x -0:36.4.0 core:move-up (atom-text-editor.editor.is-focused)
     -0:35.7.0 editor:move-to-first-character-of-line (atom-text-editor.editor.is-focused)
  3x -0:35.4.0 core:select-down (atom-text-editor.editor.is-focused)
     -0:34.7.0 editor:select-to-end-of-line (atom-text-editor.editor.is-focused)
     -0:34.3.0 snippets:next-tab-stop (atom-text-editor.editor.is-focused)
     -0:34.3.0 snippets:expand (atom-text-editor.editor.is-focused)
     -0:34.3.0 editor:indent (atom-text-editor.editor.is-focused)
  5x -0:33.7.0 core:save (atom-text-editor.editor.is-focused)
     -0:23.4.0 command-palette:toggle (atom-text-editor.editor.is-focused)
     -0:21.2.0 core:confirm (atom-text-editor.editor.mini.is-focused)
     -0:21.2.0 merge-conflicts:detect (atom-text-editor.editor)

Config

{
  "core": {
    "disabledPackages": [
      "atom-beautify",
      "linter"
    ]
  }
}

Installed Packages

# User
Sublime-Style-Column-Selection, v1.3.0
atom-pair, v2.0.10
file-icons, v1.6.11
language-haml, v0.23.6
language-rust, v0.4.5
merge-conflicts, v1.3.7
minimap, v4.16.0

# Dev
No dev packages

[thomasfedb]

I'm experiencing this issue.

[AlbertoFdzM]

+1

[IanVS]

This is happening for me on Atom 1.3.0-beta5.

[keiththecomputerguy]

+1

[jackbrown]

Getting the same error clicking 'stage' after resolving conflicts

Atom Version: 1.3.1 System: Mac OS X 10.11.2 Thrown From: merge-conflicts package, v1.3.7

Stack Trace

Uncaught Error: The index is locked. This might be due to a concurrent or crashed process

At /Users/jackbrown/.atom/packages/merge-conflicts/lib/git-bridge.coffee:189

Error: The index is locked. This might be due to a concurrent or crashed process
    at Error (native)
    at Function.GitBridge.add (/Users/jackbrown/.atom/packages/merge-conflicts/lib/git-bridge.coffee:189:15)
    at ResolverView.resolve (/Users/jackbrown/.atom/packages/merge-conflicts/lib/view/resolver-view.coffee:61:15)
    at HTMLButtonElement.<anonymous> (/Applications/Atom.app/Contents/Resources/app.asar/node_modules/atom-space-pen-views/node_modules/space-pen/lib/space-pen.js:220:36)
    at HTMLButtonElement.jQuery.event.dispatch (/Applications/Atom.app/Contents/Resources/app.asar/node_modules/jquery/dist/jquery.js:4435:9)
    at HTMLButtonElement.elemData.handle (/Applications/Atom.app/Contents/Resources/app.asar/node_modules/jquery/dist/jquery.js:4121:28)

Commands

     -0:22.8.0 merge-conflicts:detect (atom-text-editor.editor.is-focused)

Config

{
  "core": {
    "projectHome": "/Users/jackbrown/git",
    "themes": [
      "one-dark-ui",
      "slime"
    ]
  }
}

Installed Packages

# User
Stylus, v1.2.1
color-picker, v2.0.14
emmet, v2.3.17
file-icons, v1.6.13
fold-lines, v0.1.0
foldername-tabs, v0.1.6
js-refactor, v0.6.0
language-babel, v2.6.0
linter, v1.11.3
linter-eslint, v5.2.6
local-history, v3.2.3
merge-conflicts, v1.3.7
overscroll, v0.1.0
pigments, v0.19.3
refactor, v0.6.0
slime, v1.4.0

# Dev
No dev packages

[jacobmischka]

Still happening for me as well

[andreas-venturini]

Workaround for me is to click on "Maybe later" and then on the "Stage" button in the progress overview.

[tvandervorm]

Still happens for me too, also happens when I click "stage" in the progress overview. After clicking 3 or 4 times it usually works.

[esetnik]

I have the same issue. Out of curiosity are any of you encountering this when Github Desktop is also open on the repo?