Qiita Teams that are logged in
You are not logged in to any team

Log in to Qiita Team
Community
OrganizationEventAdvent CalendarQiitadon (β)
Service
Qiita JobsQiita ZineQiita Blog
25
Help us understand the problem. What are the problem?

More than 5 years have passed since last update.

Homebrewでbrew updateに失敗した際の対処方法

エラー時

$ brew update
error: Your local changes to the following files would be overwritten by merge:
     share/man/man1/brew.1
Please, commit your changes or stash them before you can merge.
Aborting
Error: Failure while executing: git pull -q origin refs/heads/master:refs/remotes/origin/master

直すgitコマンド

$ cd /usr/local
$ git add .
$ git stash
$ git reset --hard

git add . で全てのファイルをステージしたあとに、
git stash でそれをスタックに入れて作業を隠し、
git reset --hard で全て同じライン(history位置)にしてる。

これで、brew update が出来ました。

Why not register and get more from Qiita?
  1. We will deliver articles that match you
    By following users and tags, you can catch up information on technical fields that you are interested in as a whole
  2. you can read useful information later efficiently
    By "stocking" the articles you like, you can search right away
25
Help us understand the problem. What are the problem?