{"author_name":"y_hakoiri","image_url":"https://cdn-ak.f.st-hatena.com/images/fotolife/y/y_hakoiri/20191102/20191102134313.jpg","height":"190","version":"1.0","url":"https://www.y-hakopro.com/entry/2019/10/06/174718","type":"rich","title":"\u30ea\u30e2\u30fc\u30c8\u30d6\u30e9\u30f3\u30c1\u3068\u30ed\u30fc\u30ab\u30eb\u30d6\u30e9\u30f3\u30c1\u3067\u5dee\u5206\u304c\u51fa\u3061\u3083\u3063\u305f","blog_title":"\u7bb1\u306e\u30d7\u30ed\u30b0\u30e9\u30df\u30f3\u30b0\u65e5\u8a18\u3002","categories":["Git / GitHub"],"published":"2019-10-06 17:47:18","author_url":"https://blog.hatena.ne.jp/y_hakoiri/","provider_name":"Hatena Blog","html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fwww.y-hakopro.com%2Fentry%2F2019%2F10%2F06%2F174718\" title=\"\u30ea\u30e2\u30fc\u30c8\u30d6\u30e9\u30f3\u30c1\u3068\u30ed\u30fc\u30ab\u30eb\u30d6\u30e9\u30f3\u30c1\u3067\u5dee\u5206\u304c\u51fa\u3061\u3083\u3063\u305f - \u7bb1\u306e\u30d7\u30ed\u30b0\u30e9\u30df\u30f3\u30b0\u65e5\u8a18\u3002\" 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\u3067\u3061\u3087\u3063\u3068\u30d0\u30bf\u30d0\u30bf\u3057\u305f\u8a71\u3002 \u8907\u6570\u30d6\u30e9\u30f3\u30c1\u3092\u884c\u304d\u6765\u3057\u306a\u304c\u3089 stash\u3057\u305f\u308astash pop\u3057\u305f\u308a\u3092\u7e70\u308a\u8fd4\u3057\u3066\u3044\u305f\u3089\u3001 \u306a\u3093\u304b\u3088\u304f\u308f\u304b\u3089\u306a\u3044\u3051\u3069\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u8d77\u304d\u3066\u3057\u307e\u3044\u307e\u3057\u305f\u3002 \u8907\u6570\u4eba\u3067\u306e\u958b\u767a\u3067\u5c65\u6b74\u3092\u6c5a\u304f\u3057\u305f\u304f\u306a\u304b\u3063\u305f\u306e\u3067\u3001 merge\u306f\u3067\u304d\u308b\u3060\u3051\u3057\u305f\u304f\u306a\u3044\u2192\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u89e3\u6d88\u3082\u3057\u305f\u304f\u306a\u3044 \u3068\u304b\u8272\u3005\u8003\u3048\u305f\u7d50\u679c\u3001rebase\u3067\u6614\u306e\u30b3\u30df\u30c3\u30c8\u307e\u3067\u623b\u308b\u3053\u3068\u3067\u89e3\u6c7a\u306f\u3067\u304d\u305f\u3001\u3001\u3051\u3069 \u305d\u306e\u5f8c\u3001\u672c\u6765\u4f5c\u696d\u3057\u305f\u304b\u3063\u305f\u30d6\u30e9\u30f3\u30c1\u306b\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3057\u305f\u3068\u3053\u308d Switched to branch 'hoge' Your branch and 'origin/hoge' have diverged, and have\u2026","provider_url":"https://hatena.blog","width":"100%","blog_url":"https://www.y-hakopro.com/"}