Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

yarn.lock changes prevent vim-plug from updating vim-jsdoc #103

Closed
boblannon opened this issue Dec 9, 2020 · 1 comment · Fixed by #104 or #119
Closed

yarn.lock changes prevent vim-plug from updating vim-jsdoc #103

boblannon opened this issue Dec 9, 2020 · 1 comment · Fixed by #104 or #119

Comments

@boblannon
Copy link

After running PlugUpdate most of my plugins updated successfully but I got an error for vim-jsdoc.

x vim-jsdoc:
    error: Your local changes to the following files would be overwritten by merge:
        lib/yarn.lock
    Please commit your changes or stash them before you merge.
    Aborting
    Updating 1aaa337..5487673

Just wanted to give a friendly heads-up!

If anyone else runs into this, the workaround is fairly simple, just

cd ~/.vim/plugged/vim-jsdoc
git checkout -- yarn.lock

Then re-run PlugUpdate.

@heavenshell
Copy link
Owner

Thx for reporting! Add to README.md

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants