{"blog_url":"https://te2u.hatenablog.jp/","author_url":"https://blog.hatena.ne.jp/te2u/","height":"190","image_url":null,"url":"https://te2u.hatenablog.jp/entry/2016/04/26/231058","html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fte2u.hatenablog.jp%2Fentry%2F2016%2F04%2F26%2F231058\" title=\"git\u3067\u30c8\u30d4\u30c3\u30af\u30d6\u30e9\u30f3\u30c1\u3092\u30de\u30fc\u30b8\u4e2d\u306b\u30ea\u30e2\u30fc\u30c8\u30d6\u30e9\u30f3\u30c1\u304c\u66f4\u65b0\u3055\u308c\u305f\u3068\u304d\u306e\u5bfe\u5fdc - \u4f5c\u696d\u30ce\u30fc\u30c8\" class=\"embed-card embed-blogcard\" scrolling=\"no\" frameborder=\"0\" style=\"display: block; width: 100%; height: 190px; max-width: 500px; margin: 10px 0px;\"></iframe>","author_name":"te2u","title":"git\u3067\u30c8\u30d4\u30c3\u30af\u30d6\u30e9\u30f3\u30c1\u3092\u30de\u30fc\u30b8\u4e2d\u306b\u30ea\u30e2\u30fc\u30c8\u30d6\u30e9\u30f3\u30c1\u304c\u66f4\u65b0\u3055\u308c\u305f\u3068\u304d\u306e\u5bfe\u5fdc","type":"rich","width":"100%","published":"2016-04-26 23:10:58","version":"1.0","categories":["git"],"blog_title":"\u4f5c\u696d\u30ce\u30fc\u30c8","provider_name":"Hatena Blog","provider_url":"https://hatena.blog","description":"\u4f8b\u3048\u3070\u81ea\u5206\u306e\u74b0\u5883\u3067 $ git merge --no-ff feature/add-c \u30c8\u30d4\u30c3\u30af\u30d6\u30e9\u30f3\u30c1\u3092master\u30d6\u30e9\u30f3\u30c1\u306b\u30de\u30fc\u30b8\u3057\u3066 $ git push error: failed to push some refs to '********' hint: Updates were rejected because the remote contains work that you do hint: not have locally. This is usually caused by another repository pushing hint: to the same ref. \u2026"}