merge-conflicts
merge-conflicts copied to clipboard
Any stage after first one fails with locked index error
Error: The index is locked. This might be due to a concurrent or crashed process
at Error (native)
at Function.GitBridge.add (/home/steel/.atom/packages/merge-conflicts/lib/git-bridge.coffee:189:15)
at ResolverView.resolve (/home/steel/.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)
- Ubuntu 15.10 + Unity
- Atom 1.3.2
This is likely a duplicate of #171.
Is it consistently on the second and later attempts? That's a new one.
@smashwilson Yes it's consistently on second and later attempts, it works for the first time