Help us understand the problem. What is going on with this article?

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

More than 5 years have passed since last 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 が出来ました。

dvorak__
JetBrains社のIDEやキーボード配列、Mac OS Xの設定とかWeb系技術の投稿が多めです。 趣味でUnity3DやったりCVやったりしてます。
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
Comments
No comments
Sign up for free and join this conversation.
If you already have a Qiita account
Why do not you register as a user and use Qiita more conveniently?
You need to log in to use this function. Qiita can be used more conveniently after logging in.
You seem to be reading articles frequently this month. Qiita can be used more conveniently after logging in.
  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
ユーザーは見つかりませんでした