{"url":"https://yuzu441.hateblo.jp/entry/2014/02/06/090208","provider_name":"Hatena Blog","author_name":"yuzu441","description":"Git\u3067\u4f5c\u696d\u3057\u3066\u3044\u308b\u3068 \u30d6\u30e9\u30f3\u30c1\u3092\u5207\u3063\u3066\u4f5c\u696d\u3059\u308b\u3053\u3068\u304c\u3042\u308a\u307e\u3059\u3088\u306d\uff1f \u305d\u3053\u3067\u3057\u305f\u30b3\u30df\u30c3\u30c8\u3092\u4ed6\u306e\u30d6\u30e9\u30f3\u30c1\u3078 \uff11\u3064\u306ecommit\u3068\u3057\u3066\u3001\u307e\u3068\u3081\u3066merge\u3057\u305f\u3044\u3068\u601d\u3044\u307e\u3059\u3002 \u3068\u3044\u3046\u8a33--suqash\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u4f7f\u3063\u305fmerge\u306e\u4f8b\u3092 \u307e\u305a\u73fe\u5728\u306e\u4f5c\u696d\u3092\u30b3\u30df\u30c3\u30c8\u3057\u3066 $git checkout <\u30ea\u30dd\u30b8\u30c8\u30ea(\u57fa\u672c origin)> <merge\u3057\u305f\u3044\u30d6\u30e9\u30f3\u30c1> (\u308f\u304b\u308a\u3084\u3059\u304f\u3059\u308b\u305f\u3081\u3001\uff1c\uff1e\u3067\u56f2\u3063\u3066\u307e\u3059\u304c\u5b9f\u884c\u3059\u308b\u518d\u306f\u3044\u308a\u307e\u305b\u3093) checkout\u30b3\u30de\u30f3\u30c9\u3067merge\u3057\u305f\u3044\u30d6\u30e9\u30f3\u30c1\u3078\u79fb\u52d5\u3057\u307e\u3059 \u305d\u3057\u3066 $git fetch <\u30ea\u30dd\u30b8\u30c8\u30ea> <\u66f4\u65b0\u5185\u5bb9\u304c\u3042\u308b\u30d6\u30e9\u30f3\u30c1> $git log fetch_head\u2026","title":"\u4ed6\u306e\u30d6\u30e9\u30f3\u30c1\u306e\u30b3\u30df\u30c3\u30c8\u3092\u307e\u3068\u3081\u3066merge\u3059\u308b","width":"100%","type":"rich","provider_url":"https://hatena.blog","author_url":"https://blog.hatena.ne.jp/yuzu441/","blog_url":"https://yuzu441.hateblo.jp/","categories":["git"],"html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fyuzu441.hateblo.jp%2Fentry%2F2014%2F02%2F06%2F090208\" title=\"\u4ed6\u306e\u30d6\u30e9\u30f3\u30c1\u306e\u30b3\u30df\u30c3\u30c8\u3092\u307e\u3068\u3081\u3066merge\u3059\u308b - \u3086\u305a\u3081\u3082\" class=\"embed-card embed-blogcard\" scrolling=\"no\" frameborder=\"0\" style=\"display: block; width: 100%; height: 190px; max-width: 500px; margin: 10px 0px;\"></iframe>","blog_title":"\u3086\u305a\u3081\u3082","image_url":null,"published":"2014-02-06 09:02:08","version":"1.0","height":"190"}