git - brew更新:The following untracked working tree files would be overwritten by merge:

  显示原文与译文双语对照的内容

我试图运行 brew update,但我得到了一个错误如果我合并的话,我的本地更改会丢失。 我尝试提交我的本地更改( 不记得做了什么,但已经有一段时间了),这使得事情变得更糟。

以下是输出:


MBP:Library User$ sudo brew update
error: The following untracked working tree files would be overwritten by merge:
 Library/Aliases/fastcgi
 Library/Aliases/htop
 Library/Aliases/nodejs
 Library/Aliases/ocio
 Library/Aliases/oiio
 Library/Aliases/pgrep
 Library/Aliases/pkill
 Library/Contributions/cmds/brew-beer.rb
 Library/Contributions/cmds/brew-dirty.rb
 Library/Contributions/cmds/brew-graph
 Library/Contributions/cmds/brew-grep
 Library/Contributions/cmds/brew-leaves.rb
 Library/Contributions/cmds/brew-linkapps.rb
 Library/Contributions/cmds/brew-man
 Library/Contributions/cmds/brew-mirror-check.rb
 Library/Contributions/cmds/brew-missing.rb
 Library/Contributions/cmds/brew-pull.rb
 Library/Contributions/cmds/brew-readall.rb
 Library/Contributions/cmds/brew-server
 Library/Contributions/cmds/brew-services.rb
 Library/Contributions/cmds/brew-switch.rb
 Library/Contributions/cmds/brew-test-bot.commit.html.erb
 Library/Contributions/cmds/brew-test-bot.css
 Library/Contributions/cmds/brew-test-bot.index.html.erb
 Library/Contributions/cmds/brew-test-bot.rb
 Library/Contributions/cmds/brew-tests.rb
 Library/Contributions/cmds/brew-unpack.rb
 Library/Contributions/cmds/brew-which.rb
 Library/Contributions/install_homebrew.rb
 Library/Formula/abcl.rb
 Library/Formula/abyss.rb
 Library/Formula/akka.rb
 Library/Formula/apollo.rb
 Library/Formula/appledoc.rb
 Library/Formula/arangodb.rb
 Library/Formula/autoconf.rb
 Library/Formula/automake.rb
 Library/Formula/avidemux.rb
 Library/Formula/bind.rb
 Library/Formula/bsdconv.rb
 Library/Formula/bsdmake.rb
 Library/Formula/camellia.rb
 Library/Formula/cbmbasic.rb
 Library/Formula/cdo.rb
 Library/Formula/checkstyle.rb
 Library/Formula/cifer.rb
 Library/Formula/clhep.rb
 Library/Formula/collada-dom.rb
 Library/Formula/crash.rb
 Library/Formula/crossroads.rb
 Library/Formula/css-crush.rb
 Library/Formula/curlftpfs.rb
 Library/Formula/dart.rb
 Library/Formula/dasm.rb
 Library/Formula/dfc.rb
 Library/Formula/di.rb
 Library/Formula/dsniff.rb
 Library/Formula/dupx.rb
 Library/Formula/dwatch.rb
 Library/Formula/eprover.rb
 Library/Formula/ext2fuse.rb
 Library/Formula/ezlupdate.rb
 Library/Formula/f3.rb
 Library/Formula/fastx_toolkit.rb
 Library/Formula/fceux.rb
 Library/Formula/findbugs.rb
 Library/Formula/freerdp.rb
 Library/Formula/funcoeszz.rb
 Library/Formula/fwknop.rb
 Library/Formula/gabedit.rb
 Library/Formula/gbdfed.rb
 Library/Formula/gconf.rb
 Library/Formula/git-encrypt.rb
 Library/Formula/glm.rb
 Library/Formula/gmap-gsnap.rb
 Library/Formula/gnu-arch.rb
 Library/Formula/gnunet.rb
 Library/Formula/gobby.rb
 Library/Formula/gptfdisk.rb
 Library/Formula/griffon.rb
 Library/Formula/grok.rb
 Library/Formula/gtk-chtheme.rb
 Library/Formula/gtkglextmm.rb
 Library/Formula/gtmess.rb
 Library/Formula/hg-flow.rb
 Library/Formula/hqx.rb
 Library/Formula/htop-osx.rb
 Library/Formula/htpdate.rb
 Library/Formula/imap-uw.rb
 Library/Formula/iozone.rb
 Library/Formula/ipbt.rb
 Library/Formula/ipe.rb
 Library/Formula/ispc.rb
 Library/Formula/ispell.rb
 Library/Formula/jigdo.rb
 Library/Formula/jing.rb
 Library/Formula/jless.rb
 Library/Formula/jpeginfo.rb
 Library/Formula/konoha.rb
 Library/Formula/legit.rb
 Library/Formula/libcouchbase.rb
 Library/Formula/libcuefile.rb
 Library/Formula/libextractor.rb
 Library/Formula/libglademm.rb
 Library/Formula/libgtextutils.rb
 Library/Formula/libinfinity.rb
 Library/Formula/libkate.rb
 Library/Formula/libqalculate.rb
 Library/Formula/libqglviewer.rb
 Library/Formula/libreplaygain.rb
 Library/Formula/libtool.rb
 Library/Formula/libvbucket.rb
 Library/Formula/libvo-aacenc.rb
 Library/Formula/libxmi.rb
 Library/Formula/lifelines.rb
 Library/Formula/makeicns.rb
 Library/Formula/mathgl.rb
 Library/Formula/meld.rb
 Library/Formula/mesalib-glw.rb
 Library/Formula/minisat.rb
 Library/Formula/minuit2.rb
 Library/Formula/mobile-shell.rb
 Library/Formula/movgrab.rb
 Library/Formula/mp3cat.rb
 Library/Formula/mpich2.rb
 Library/Formula/mrfast.rb
 Library/Formula/musepack.rb
 Library/Formula/ndiff.rb
 Library/Formula/net6.rb
 Library/Formula/nrpe.rb
 Library/Formula/nuttcp.rb
 Library/Formula/oath-toolkit.
Updating aa07533..3f070ef
Aborting
Error: Failed while executing git pull origin refs/heads/master:refs/remotes/origin/master

时间:

几周前我也有类似的问题试图更新旧的Homebrew 安装。 执行以下操作:


git reset --hard origin/master

/usr/local 中为我修复它。

似乎其他人也有过这个问题。 你在这里查看过任何建议的变通方法

我添加了个人经验,因为它比在 2012中建议的更安全:

  1. 运行 brew doctor
  2. 如果你得到以下警告:

    
    Warning: The/usr/local directory is not writable.
    
    

    运行:

    
    sudo chown -R `whoami`/usr/local
    
    

    修复权限问题( 就像 Chris Frisina所建议的) 。 再次运行 brew doctor 以确保警告已经消失。

  3. 现在,你应该有一个

    
    Warning: You have uncommitted modifications to Homebrew
    
    

    这可能会被

    
    cd/usr/local/Library && git stash && git clean -d -f
    
    

    就像 Dr.Brew 本身建议的那样。 命令保存未提交的修改,以便你可以返回并在需要时恢复它们。 这似乎比 git reset --hard origin/master 给我。

  4. 如果你愿意,请检查官方疑难解答指南如果这里建议的步骤和其他用户不解决你的问题。

...