{"image_url":null,"url":"https://kimagureneet.hatenablog.com/entry/2017/04/29/041718","width":"100%","provider_name":"Hatena Blog","blog_title":"\u3068\u308a\u3042\u3048\u305aphp\u3068\u304b","html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fkimagureneet.hatenablog.com%2Fentry%2F2017%2F04%2F29%2F041718\" title=\"git merge\u3084\u308a\u76f4\u3057\u624b\u9806\u30e1\u30e2 - \u3068\u308a\u3042\u3048\u305aphp\u3068\u304b\" class=\"embed-card embed-blogcard\" scrolling=\"no\" frameborder=\"0\" style=\"display: block; width: 100%; height: 190px; max-width: 500px; margin: 10px 0px;\"></iframe>","type":"rich","provider_url":"https://hatena.blog","categories":["git"],"author_url":"https://blog.hatena.ne.jp/yoppy0066/","height":"190","blog_url":"https://kimagureneet.hatenablog.com/","published":"2017-04-29 04:17:18","title":"git merge\u3084\u308a\u76f4\u3057\u624b\u9806\u30e1\u30e2","description":"\u30de\u30fc\u30b8\u3057\u76f4\u3059\u3068\u304d\u306e\u624b\u9806\u30e1\u30e2\u3002\u3044\u3061\u304a\u3046\u4eca\u56de\u306f\u30de\u30fc\u30b8\u5148\u306e\u30d6\u30e9\u30f3\u30c1\u3092\u6b8b\u3057\u305f\u3044\u5834\u5408\u3002\u3067\u3001\u3053\u306e\u4f8b\u3060\u3068git reset \u3067\u3084\u308a\u76f4\u305b\u308b\u3051\u3069\u4eca\u56de\u3084\u308a\u305f\u304b\u3063\u305f\u306e\u306fpush\u3057\u305f\u30de\u30fc\u30b8\u3092\u3084\u308a\u76f4\u3057\u305f\u304b\u3063\u305f\u306e\u3067\u3053\u306e\u5f62\u306b\u306a\u3063\u305f\u3002\u6700\u521d\u306e\u30de\u30fc\u30b8 $ git branch * dev1 dev2 $ git merge dev2 Auto-merging test CONFLICT (content): Merge conflict in test Automatic merge failed; fix conflicts and then commit the result. \u301c\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u4fee\u6b63\u301c $ git commi\u2026","author_name":"yoppy0066","version":"1.0"}