smashwilson / merge-conflicts

Resolve git merge conflicts in Atom
https://atom.io/packages/merge-conflicts
MIT License
431 stars 42 forks source link

Uncaught Error: Failed to rename lockfile to '/Volumes/Dev2/melijoe/.git/index': Resource busy #253

Open l-landier opened 7 years ago

l-landier commented 7 years ago

[Enter steps to reproduce below:]

  1. ...
  2. ...

Atom Version: 1.11.2 Electron Version: 0.37.8 System: Mac OS X 10.12.1 Thrown From: merge-conflicts package, v1.4.4

Stack Trace

Uncaught Error: Failed to rename lockfile to '/Volumes/Dev2/melijoe/.git/index': Resource busy

At /Users/l.landier/.atom/packages/merge-conflicts/lib/git/shellout.js:142

Error: Failed to rename lockfile to '/Volumes/Dev2/melijoe/.git/index': Resource busy
    at Error (native)
    at GitContext.resolveFile (/Users/l.landier/.atom/packages/merge-conflicts/lib/git/shellout.js:142:24)
    at MergeConflictsView.resolveFile (/Users/l.landier/.atom/packages/merge-conflicts/lib/view/merge-conflicts-view.coffee:122:20)
    at HTMLButtonElement.<anonymous> (/Users/l.landier/.atom/packages/merge-conflicts/node_modules/space-pen/lib/space-pen.js:220:36)
    at HTMLButtonElement.jQuery.event.dispatch (/Users/l.landier/.atom/packages/merge-conflicts/node_modules/jquery/dist/jquery.js:4435:9)
    at HTMLButtonElement.elemData.handle (/Users/l.landier/.atom/packages/merge-conflicts/node_modules/jquery/dist/jquery.js:4121:28)

Commands

     -8:45 editor:consolidate-selections (atom-text-editor.editor.mini.is-focused)
     -8:45 core:cancel (atom-text-editor.editor.mini.is-focused)
     -8:38.9.0 command-palette:toggle (atom-text-editor.editor.is-focused)
     -8:38.2.0 core:paste (atom-text-editor.editor.mini.is-focused)
     -8:34.7.0 merge-conflicts:detect (atom-text-editor.editor)
     -8:22.9.0 command-palette:toggle (atom-text-editor.editor.is-focused)
     -8:21.6.0 core:paste (atom-text-editor.editor.mini.is-focused)
     -8:20.5.0 core:move-down (atom-text-editor.editor.mini.is-focused)
     -8:20.1.0 core:move-up (atom-text-editor.editor.mini.is-focused)
     -8:15.9.0 core:confirm (atom-text-editor.editor.mini.is-focused)
     -8:15.9.0 merge-conflicts:detect (atom-text-editor.editor)
  3x -8:12.1.0 pane:show-next-item (atom-text-editor.editor.is-focused)
     -1:17.9.0 core:save (atom-text-editor.editor.conflicted.is-focused)
     -1:15.2.0 core:move-to-bottom (atom-text-editor.editor.conflicted.is-focused)
  6x -0:24.1.0 core:undo (atom-text-editor.editor.conflicted.is-focused)
  3x -0:13 core:close (atom-workspace.workspace.scrollbars-visible-when-scrolling.theme-one-light-syntax.theme-one-light-ui)

Config

{
  "core": {
    "telemetryConsent": "limited",
    "themes": [
      "one-light-ui",
      "one-light-syntax"
    ]
  }
}

Installed Packages

# User
language-smarty, v1.7.0 (active)
less-than-slash, v0.16.0 (active)
merge-conflicts, v1.4.4 (active)
atom-dark-syntax, v0.27.0 (inactive)
atom-dark-ui, v0.52.0 (inactive)
atom-light-syntax, v0.28.0 (inactive)
atom-light-ui, v0.44.0 (inactive)
base16-tomorrow-dark-theme, v1.2.0 (inactive)
base16-tomorrow-light-theme, v1.2.0 (inactive)
one-dark-ui, v1.6.0 (inactive)
one-light-ui, v1.6.0 (active)
one-dark-syntax, v1.3.0 (inactive)
one-light-syntax, v1.3.0 (active)
solarized-dark-syntax, v1.0.2 (inactive)
solarized-light-syntax, v1.0.2 (inactive)
about, v1.7.0 (active)
archive-view, v0.61.1 (active)
autocomplete-atom-api, v0.10.0 (active)
autocomplete-css, v0.11.2 (active)
autocomplete-html, v0.7.2 (active)
autocomplete-plus, v2.31.1 (active)
autocomplete-snippets, v1.11.0 (active)
autoflow, v0.27.0 (inactive)
autosave, v0.23.1 (active)
background-tips, v0.26.1 (active)
bookmarks, v0.42.0 (active)
bracket-matcher, v0.82.1 (active)
command-palette, v0.38.0 (active)
deprecation-cop, v0.54.1 (active)
dev-live-reload, v0.47.0 (active)
encoding-selector, v0.22.0 (active)
exception-reporting, v0.40.0 (active)
find-and-replace, v0.201.1 (active)
fuzzy-finder, v1.4.0 (active)
git-diff, v1.1.0 (active)
go-to-line, v0.31.0 (inactive)
grammar-selector, v0.48.2 (active)
image-view, v0.59.0 (active)
incompatible-packages, v0.26.1 (active)
keybinding-resolver, v0.35.0 (active)
line-ending-selector, v0.5.0 (active)
link, v0.31.1 (inactive)
markdown-preview, v0.158.0 (active)
metrics, v1.0.0 (active)
notifications, v0.65.1 (active)
open-on-github, v1.2.0 (inactive)
package-generator, v1.0.0 (inactive)
settings-view, v0.242.2-hotfix1 (active)
snippets, v1.0.2 (active)
spell-check, v0.68.2 (active)
status-bar, v1.4.1 (active)
styleguide, v0.47.0 (active)
symbols-view, v0.113.1 (active)
tabs, v0.101.0 (active)
timecop, v0.33.2 (active)
tree-view, v0.209.3 (active)
update-package-dependencies, v0.10.0 (active)
welcome, v0.35.1 (active)
whitespace, v0.33.0 (active)
wrap-guide, v0.38.2 (active)
language-c, v0.52.1 (active)
language-clojure, v0.21.0 (active)
language-coffee-script, v0.47.2 (active)
language-csharp, v0.12.1 (active)
language-css, v0.37.1 (active)
language-gfm, v0.88.0 (active)
language-git, v0.15.0 (active)
language-go, v0.42.1 (active)
language-html, v0.45.1 (active)
language-hyperlink, v0.16.0 (active)
language-java, v0.23.0 (active)
language-javascript, v0.119.0 (active)
language-json, v0.18.2 (active)
language-less, v0.29.5 (active)
language-make, v0.22.2 (active)
language-mustache, v0.13.0 (active)
language-objective-c, v0.15.1 (active)
language-perl, v0.35.0 (active)
language-php, v0.37.2 (active)
language-property-list, v0.8.0 (active)
language-python, v0.45.0 (active)
language-ruby, v0.69.0 (active)
language-ruby-on-rails, v0.25.0 (active)
language-sass, v0.56.0 (active)
language-shellscript, v0.22.4 (active)
language-source, v0.9.0 (active)
language-sql, v0.23.0 (active)
language-text, v0.7.1 (active)
language-todo, v0.28.0 (active)
language-toml, v0.18.0 (active)
language-xml, v0.34.9 (active)
language-yaml, v0.26.0 (active)

# Dev
No dev packages
smashwilson commented 7 years ago

:wave: Thanks for taking the time to file an issue here! Unfortunately, this repository is being deprecated, so I won't be getting to this one here.

This one should be taken care of by the new git and GitHub package for Atom. If you see something similar, please file an issue there to let us know. Thanks 🙇