{"width":"100%","categories":["Git"],"image_url":null,"published":"2011-11-22 00:10:13","blog_title":"by shigemk2","type":"rich","author_url":"https://blog.hatena.ne.jp/shigemk2/","height":"190","url":"https://www.shigemk2.com/entry/20111122/1321974613","version":"1.0","provider_name":"Hatena Blog","title":"fatal: You have not concluded your merge. (MERGE_HEAD exists)\u3068\u3044\u3046\u30a8\u30e9\u30fc\u306b\u3064\u3044\u3066","blog_url":"https://www.shigemk2.com/","provider_url":"https://hatena.blog","author_name":"shigemk2","html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fwww.shigemk2.com%2Fentry%2F20111122%2F1321974613\" title=\"fatal: You have not concluded your merge. (MERGE_HEAD exists)\u3068\u3044\u3046\u30a8\u30e9\u30fc\u306b\u3064\u3044\u3066 - by shigemk2\" class=\"embed-card embed-blogcard\" scrolling=\"no\" frameborder=\"0\" style=\"display: block; width: 100%; height: 190px; max-width: 500px; margin: 10px 0px;\"></iframe>","description":"[git] MERGE_HEAD exists - ikeyasuki\u306e\u65e5\u8a18 \u3088\u308a\u3002 % git reset --merge \u4e00\u5fdc\u516c\u5f0f\u306b\u306f '--merge -- reset out of a conflicted merge' \u3068\u66f8\u3044\u3066\u3042\u308b\u306e\u3067\u3001\u305d\u306e\u901a\u308a\u3067\u306f\u306a\u3044\u304b\u3068\u601d\u3046\u3002"}