Error during update #81

gmarik opened this Issue Aug 28, 2011 · 4 comments

4 participants


Sometimes i get weird errors updating bundles.

Ie when I push updates through the github online editor and then do :BundleInstall! to update I get error saying:

[110828 13:53:00] Bundle gmarik/vundle
[110828 13:53:00] $ cd '/Users/marjanhratson/.vim/bundle/vundle' && git pull
[110828 13:53:00] > error: Your local changes to the following files would be overwritten by merge:
                    Please, commit your changes or stash them before you can merge.
                    Updating 70cc27d..152a0d4

I'd be totally ok, if I had any changes but I hadn't.

To debug, in Vim, I run:

echo system("cd '~/.vim/bundle/vundle' && ls -la && git status")

and get

total 16
drwxr-xr-x   7 gmarik  staff   238 Aug 28 14:38 .
drwxr-xr-x  47 gmarik  staff  1598 Aug 27 01:55 ..
drwxr-xr-x  13 gmarik  staff   442 Aug 28 15:09 .git
-rw-r--r--   1 gmarik  staff  4302 Aug 28 13:55
drwxr-xr-x   4 gmarik  staff   136 Aug 28 13:52 autoload
drwxr-xr-x   4 gmarik  staff   136 Aug 28 13:52 doc
drwxr-xr-x   3 gmarik  staff   102 Aug 28 13:52 test
# On branch master
# Your branch is behind 'origin/master' by 1 commit, and can be fast-forwarded.
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#       deleted:
#       deleted:    autoload/vundle.vim
#       deleted:    autoload/vundle/config.vim
#       deleted:    autoload/vundle/installer.vim
#       deleted:    autoload/vundle/scripts.vim
#       deleted:    doc/vundle.txt
#       deleted:    test/vimrc
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#       autoload/
#       doc/
#       test/ 

Which means something is seriously messed up somewhere.

I have no idea how is that possible ATM.

BUT it worked with test/minirc.vim, meaning something (either plugin or my customizations) cause it.

That's probably the most serious issue so far: kinda hard to reproduce and very annoying...


Whoa, haven't had that one happen. does it only occur when pulling from a repo you're recently github-edited?


I suspect it's caused by a plugin i'm using...
Happens from time to time for me.
Need to dig into a bit more...

@gmarik gmarik was assigned Dec 20, 2011

Does this still happen? Otherwise I think it could be closed.


@gmarik can we close this one?

@gmarik gmarik closed this Apr 5, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment