{"author_url":"https://blog.hatena.ne.jp/riocampos/","url":"https://riocampos-tech.hatenablog.com/entry/20130529/p1","type":"rich","html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Friocampos-tech.hatenablog.com%2Fentry%2F20130529%2Fp1\" title=\"brew update\u3067\u30a8\u30e9\u30fc - \u5225\u9928 \u5b50\u5b50\u5b50\u5b50\u5b50\u5b50\uff08\u306d\u3053\u306e\u3053\u3053\u306d\u3053\uff09\u306f\u3066\u30d6\u30ed\u90e8\" class=\"embed-card embed-blogcard\" scrolling=\"no\" frameborder=\"0\" style=\"display: block; width: 100%; height: 190px; max-width: 500px; margin: 10px 0px;\"></iframe>","published":"2013-05-29 00:00:03","categories":["Mac","LionServer"],"version":"1.0","author_name":"riocampos","blog_title":"\u5225\u9928 \u5b50\u5b50\u5b50\u5b50\u5b50\u5b50\uff08\u306d\u3053\u306e\u3053\u3053\u306d\u3053\uff09\u306f\u3066\u30d6\u30ed\u90e8","title":"brew update\u3067\u30a8\u30e9\u30fc","image_url":null,"provider_url":"https://hatena.blog","blog_url":"https://riocampos-tech.hatenablog.com/","height":"190","description":"mini:~ admin$ brew update error: Your local changes to the following files would be overwritten by merge: Library/Formula/ffmpeg.rb 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\u2026","width":"100%","provider_name":"Hatena Blog"}