Andreas Christoffersen | 24 Aug 10:59 2011
Picon

Re: brew update: error: Your local changes ... would be overwritten... commit or stash

Dear list.
I tried to update brew and got this:

Andreas-MacBook-Pro:~ andreas$ brew update
 * branch            master     -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
Library/Formula/djview4.rb
Library/Formula/emacs.rb
Library/Formula/ffmpeg.rb
Library/Formula/glib.rb
Library/Formula/gradle.rb
Library/Formula/jenkins.rb
Library/Formula/mplayer.rb
Library/Formula/parallel.rb
Library/Formula/stunnel.rb
Library/Formula/wget.rb
Library/Formula/wine.rb
Please, commit your changes or stash them before you can merge.
Updating c5f4cb9..76e294e
Aborting
Error: Failed while executing git pull http://github.com/mxcl/homebrew.git master

Since 1) I haven't changed any of those files, 2) only know very basic git - i am really not inclined to do a git stash in those folders. - Any idea what the problem might be?

Sincerely and thanks in advance

Andreas

Sebastian Koch | 24 Aug 12:57 2011
Picon

Re: Re: brew update: error: Your local changes ... would be overwritten... commit or stash

Getting even more files with:

error: The following untracked working tree files would be overwritten by checkout:

a lot of them in Library/Aliases/ And Library/Formula

Additionally (and this might be the cause of the problem) the .gitignore file would be overwritten.

Something is wrong here.

My .gitignore file does not differ from the one I can see here: https://github.com/mxcl/homebrew/blob/master/.gitignore

Sebastian


On 24.08.2 011, at 10:59, Andreas Christoffersen wrote:

Dear list.
I tried to u pdate brew and got this:

Andreas-MacBook-Pro:~ andreas$ brew update
 * branch            master     -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
Library/Formula/djview4.rb
Library/Formula/emacs.rb
Library/Formula/ffmpeg.rb
Library/Formula/glib.rb
Library/Formula/gradle.rb
Library/Formula/jenkins.rb
Library/Formula/mplayer.rb
Library/Formula/parallel.rb
Library/Formula/stunnel.rb
Library/Formula/wget.rb
Library/Formula/wine.rb
Please, commit your changes or stash them before you can merge.
Updating c5f4cb9..76e294e
Aborting
Error: Failed while executing git pull http://github.com/mxcl/homebrew.git master

Since 1) I haven't changed any of those files, 2) only know very basic git - i am really not inclined to do a git stash in those folders. - Any idea what the problem might be?

Sincerely and thanks in advance

Andreas


Max Howell | 24 Aug 13:04 2011

Re: Re: brew update: error: Your local changes ... would be overwritten... commit or stash

Please report bugs to the bug tracker.

There are several tickets recently closed about this issue, all containing solutions for how to solve it.

Basically: git reset --hard

Apologies for the bug though.

Max


Getting even more files with:

error: The following untracked working tree files would be overwritten by checkout:

a lot of them in Library/Aliases/ And Library/Formula

Additionally (and this might be the cause of the problem) the .gitignore file would be overwritten.

Something is wrong here.

My .gitignore file does not differ from the one I can see here: https://github.com/mxcl/homebrew/blob/master/.gitignore

Sebastian

Dear list.
I tried to u pdate brew and got this:

Andreas-MacBook-Pro:~ andreas$ brew update
 * branch            master     -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
Library/Formula/djview4.rb
Library/Formula/emacs.rb
Library/Formula/ffmpeg.rb
Library/Formula/glib.rb
Library/Formula/gradle.rb
Library/Formula/jenkins.rb
Library/Formula/mplayer.rb
Library/Formula/parallel.rb
Library/Formula/stunnel.rb
Library/Formula/wget.rb
Library/Formula/wine.rb
Please, commit your changes or stash them before you can merge.
Updating c5f4cb9..76e294e
Aborting
Error: Failed while executing git pull http://github.com/mxcl/homebrew.git master

Since 1) I haven't changed any of those files, 2) only know very basic git - i am really not inclined to do a git stash in those folders. - Any idea what the problem might be?

Sincerely and thanks in advance

Andreas

Gmane