{"author_name":"yuheiomori0718","blog_title":"\u30e1\u30e2\u7f6e\u304d\u5834","title":"git merge\u3067\u30b3\u30df\u30c3\u30c8\u3057\u306a\u3044\u65b9\u6cd5\u306e\u30e1\u30e2","author_url":"https://blog.hatena.ne.jp/yuheiomori0718/","published":"2012-10-09 23:48:46","version":"1.0","url":"https://y0m0r.hateblo.jp/entry/20121009/1349794126","image_url":null,"provider_name":"Hatena Blog","categories":["git","memo"],"html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fy0m0r.hateblo.jp%2Fentry%2F20121009%2F1349794126\" title=\"git merge\u3067\u30b3\u30df\u30c3\u30c8\u3057\u306a\u3044\u65b9\u6cd5\u306e\u30e1\u30e2 - \u30e1\u30e2\u7f6e\u304d\u5834\" class=\"embed-card embed-blogcard\" scrolling=\"no\" frameborder=\"0\" style=\"display: block; width: 100%; height: 190px; max-width: 500px; margin: 10px 0px;\"></iframe>","width":"100%","height":"190","description":"git merge\u306f\u30de\u30fc\u30b8\u5f8c\u306bcommit\u307e\u3067\u3084\u3063\u3066\u3057\u307e\u3046 \u30bd\u30fc\u30b9\u306e\u30de\u30fc\u30b8\u3060\u3051\u3084\u3063\u3066\u3001commit\u306f\u624b\u52d5\u3067\u3084\u308a\u305f\u3044\u5834\u5408\u306f\u3069\u3046\u3059\u308b\u306e\u304b\u8abf\u3079\u305f \u65b9\u6cd51 $ git merge --no-commit --no-ff $BRANCH Automatic merge went well; stopped before committing as requested\u53c2\u8003 http://stackoverflow.com/questions/501407/is-there-a-git-merge-dry-run-option \u65b9\u6cd52 $ git merge --squash $BRANCH Squash \u2026","type":"rich","provider_url":"https://hatena.blog","blog_url":"https://y0m0r.hateblo.jp/"}