{"provider_name":"Hatena Blog","blog_url":"https://moca.hatenadiary.jp/","blog_title":"moca's blog","image_url":null,"html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fmoca.hatenadiary.jp%2Fentry%2F2015%2F12%2F01%2F124856\" title=\"git pull\u6642\u306emerge\u3067\u30a8\u30e9\u30fc - moca&#39;s blog\" class=\"embed-card embed-blogcard\" scrolling=\"no\" frameborder=\"0\" style=\"display: block; width: 100%; height: 190px; max-width: 500px; margin: 10px 0px;\"></iframe>","version":"1.0","categories":[],"url":"https://moca.hatenadiary.jp/entry/2015/12/01/124856","title":"git pull\u6642\u306emerge\u3067\u30a8\u30e9\u30fc","author_name":"moca_sd","provider_url":"https://hatena.blog","type":"rich","description":"error: The following untracked working tree files would be overwritten by merge: \u3068\u8a00\u308f\u308c\u3066\u3001\u30ed\u30fc\u30ab\u30eb\u306e\u4fee\u6b63\u306f\u6368\u3066\u3066\u3057\u307e\u3063\u3066\u3044\u3044\u3068\u304d\u306e\u5bfe\u51e6\u65b9\u6cd5\u3002 version control - Force Git to overwrite local files on pull - Stack Overflow git fetch --all git reset --hard origin/master \u307b\u304b\u306e\u30d6\u30e9\u30f3\u30c1\u3067\u4f5c\u696d\u4e2d\u306a\u3089 git fetch --all git reset --hard origin/your_bra\u2026","height":"190","published":"2015-12-01 12:48:56","author_url":"https://blog.hatena.ne.jp/moca_sd/","width":"100%"}