Closed charyorde closed 10 years ago
Was vundle tested with lua?
This is a known issue: #470 #474 #501
But please post a smaller vimrc next time (thats a rule for bugreports with any software). It not only shows that you did try to fix it yourself but also makes it easier to find the problem. Oh and you could also search closed bugs befor opening a new one.
Thanks
I followed #470 and I'm getting this:
bash-3.2$ git pull
remote: Counting objects: 4, done.
remote: Compressing objects: 100% (4/4), done.
remote: Total 4 (delta 0), reused 2 (delta 0)
Unpacking objects: 100% (4/4), done.
From https://github.com/gmarik/vundle
8db3bcb..0b28e33 master -> origin/master
Updating c3ec879..0b28e33
error: Your local changes to the following files would be overwritten by merge:
README.md
autoload/vundle.vim
autoload/vundle/config.vim
autoload/vundle/installer.vim
autoload/vundle/scripts.vim
doc/vundle.txt
test/minirc.vim
test/vimrc
Please, commit your changes or stash them before you can merge.
Aborting
Not sure if stashing would pose any threats.
did you make any changes to vundle? Why? You should probably commit them to a branch and try to merge them after you pulled the upstream master
No I didn't. I was surprised as well.
If I remember correctly. The only thing I did was to upgrade vim to version 7.4 by installing from a brew formula. And when it completed I ran :BundleInstall!
Well, I simply stashed it and BundleInstall! seems to update successfully.
Env:
vimrc:
vim --version
My shell is /bin/bash.