{"description":"\u3044\u307e\u3084 Git \u306a\u3057\u3067\u306f\u751f\u304d\u3066\u3044\u3051\u306a\u3044\u304f\u3089\u3044 Git \u306b\u652f\u3048\u3089\u308c\u3066\u3044\u308b\u751f\u6d3b\u3092\u9001\u3063\u3066\u3044\u307e\u3059\u304c\u3001Git \u306e\u30d6\u30e9\u30f3\u30c1\u3092\u30de\u30fc\u30b8\u3059\u308b\u624b\u6bb5\u306b\u306f\u3044\u308d\u3044\u308d\u3042\u3063\u3066\u3001\u5b9f\u969b GitHub \u3067\u3082\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u3092\u30de\u30fc\u30b8\u3059\u308b\u3068\u304d\u306b\u306f 3 \u7a2e\u985e\u306e\u65b9\u6cd5\u304b\u3089\u9078\u3076\u3088\u3046\u4fc3\u3055\u308c\u307e\u3059\u3002 git merge \u30d6\u30e9\u30f3\u30c1\u3092\u30de\u30fc\u30b8\u3059\u308b\u30b3\u30de\u30f3\u30c9\u3067\u3059\u304c\u3001\u30d6\u30e9\u30f3\u30c1\u306e\u72b6\u6cc1\u306b\u3088\u3063\u3066\u6319\u52d5\u304c\u5909\u308f\u308a\u307e\u3059\u3002\u5177\u4f53\u7684\u306b\u306f Fast Forward \u3068 non-Fast Forward \u306e 2 \u7a2e\u985e\u304c\u3042\u308a\u3001\u30aa\u30d7\u30b7\u30e7\u30f3\u3067\u6307\u5b9a\u3057\u306a\u3044\u9650\u308a\u306f Git \u304c\u52dd\u624b\u306b\u5224\u65ad\u3057\u3066\u304f\u308c\u307e\u3059\u3002\u3053\u3053\u3067\u306f\u3001master\u304b\u3089\u6d3e\u751f\u3057\u305ftopic/a\u30d6\u30e9\u30f3\u30c1\u3092master\u306b\u30de\u30fc\u30b8\u3059\u308b\u3053\u3068\u3092\u60f3\u5b9a\u3057\u305f\u3068\u2026","provider_url":"https://hatena.blog","categories":[],"author_name":"KeithYokoma","provider_name":"Hatena Blog","author_url":"https://blog.hatena.ne.jp/KeithYokoma/","blog_title":"Infinito Nirone 7","height":"190","html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fblog.keithyokoma.dev%2Fentry%2F2019%2F01%2F27%2F234043\" title=\"git merge \u306e 3 \u3064\u306e\u52d5\u304d - Infinito Nirone 7\" class=\"embed-card embed-blogcard\" scrolling=\"no\" frameborder=\"0\" style=\"display: block; width: 100%; height: 190px; max-width: 500px; margin: 10px 0px;\"></iframe>","blog_url":"https://blog.keithyokoma.dev/","version":"1.0","image_url":"https://cdn-ak.f.st-hatena.com/images/fotolife/K/KeithYokoma/20190127/20190127233656.png","published":"2019-01-27 23:40:43","title":"git merge \u306e 3 \u3064\u306e\u52d5\u304d","width":"100%","type":"rich","url":"https://blog.keithyokoma.dev/entry/2019/01/27/234043"}