{"provider_url":"https://hatena.blog","author_url":"https://blog.hatena.ne.jp/yoshi-ken/","categories":["git"],"blog_url":"https://y-ken.hatenablog.com/","type":"rich","blog_title":"Y-Ken Studio","version":"1.0","image_url":"http://cdn-ak.f.st-hatena.com/images/fotolife/y/yoshi-ken/20130606/20130606213009.png","description":"\u30d6\u30e9\u30f3\u30c1\u3092\u5207\u3063\u3066\u304b\u3089\u6642\u9593\u304c\u7d4c\u904e\u3057\u3001\u5927\u672c\u306emaster\u306a\u3044\u3057develop\u30d6\u30e9\u30f3\u30c1\u306e\u30b3\u30df\u30c3\u30c8\u5185\u5bb9\u3092\u53d6\u308a\u8fbc\u307f\u305f\u3044\u6642\u306e\u304a\u5f79\u7acb\u3061\u30e1\u30e2\u3002 \u4f7f\u3048\u308b\u30b7\u30fc\u30f3 fast-forward\u3067\u306e\u53d6\u308a\u8fbc\u307f\u306f\u3053\u3093\u306a\u6642\u306b\u4fbf\u5229\u3067\u3059\u3002 \u7dca\u6025\u30ea\u30ea\u30fc\u30b9\u306a\u3069\u3067\u3001git-flow\u306e\u304a\u7d04\u675f\u3067\u3042\u308bdevelop\u30d6\u30e9\u30f3\u30c1\u3092\u7d4c\u7531\u305b\u305a\u306b master\u306b\u30de\u30fc\u30b8\u3055\u308c\u3066\u3057\u307e\u3063\u305f\u3082\u306e\u3092\u3001develop\u30d6\u30e9\u30f3\u30c1\u306b\u53d6\u308a\u8fbc\u307f\u305f\u3044 GitHub\u3067\u30d5\u30a9\u30fc\u30af\u3057\u3066\u304b\u3089\u6642\u9593\u304c\u7d4c\u3061\u3001\u30d5\u30a9\u30fc\u30af\u5143\u306e\u66f4\u65b0\u3092\u307e\u308b\u3063\u3068\u53d6\u308a\u8fbc\u307f\u305f\u3044","title":"Git\u5c0f\u6280\uff1a\u5b9f\u4f8b\u3067\u898b\u308b\u3001\u5225\u30d6\u30e9\u30f3\u30c1\u306e\u5dee\u5206\u3092rebase\u3084merge\u4ee5\u5916\u3067\u53d6\u308a\u8fbc\u3080\u65b9\u6cd5","url":"https://y-ken.hatenablog.com/entry/git-pull-upstream-branch","html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fy-ken.hatenablog.com%2Fentry%2Fgit-pull-upstream-branch\" title=\"Git\u5c0f\u6280\uff1a\u5b9f\u4f8b\u3067\u898b\u308b\u3001\u5225\u30d6\u30e9\u30f3\u30c1\u306e\u5dee\u5206\u3092rebase\u3084merge\u4ee5\u5916\u3067\u53d6\u308a\u8fbc\u3080\u65b9\u6cd5 - Y-Ken Studio\" class=\"embed-card embed-blogcard\" scrolling=\"no\" frameborder=\"0\" style=\"display: block; width: 100%; height: 190px; max-width: 500px; margin: 10px 0px;\"></iframe>","published":"2013-06-06 21:31:15","provider_name":"Hatena Blog","author_name":"yoshi-ken","height":"190","width":"100%"}