{"categories":["\u30d7\u30ed\u30b0\u30e9\u30df\u30f3\u30b0\u30fb\u958b\u767a","Git"],"title":"git rebase --continue \u3057\u3088\u3046\u3068\u3057\u3066 No changes - did you forget to use 'git add'? \u3068\u8a00\u308f\u308c\u305f\u3089\u3069\u3046\u3057\u305f\u3089\u3044\u3044\u306e\u304b","blog_url":"https://www.utakata.work/","published":"2018-01-19 10:00:00","description":"\u6700\u521d\u306b\u7d50\u8ad6 git rebase --skip \u3059\u308c\u3070\u826f\u3044\u3002 \u6700\u521d\u306b\u7d50\u8ad6 \u72b6\u6cc1 \u5b9f\u969b\u306b\u8d77\u3053\u3063\u305f\u4f8b \u89e3\u6c7a\u3059\u308b \u53c2\u8003\u8a18\u4e8b \u72b6\u6cc1 git rebase \u3084 git merge \u3067\u3001 conflict \u3059\u308b\u3053\u3068\u304c\u3042\u308a\u307e\u3059\u3002\u3053\u306e\u6642\u3001\u5927\u62b5\u306f\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u89e3\u6d88\u3057\u3001git add \u3057\u3066 git rebase --continue \u3084 git merge --continue \u3059\u308c\u3070\u89e3\u6c7a\u3057\u307e\u3059\u3002 \u3057\u304b\u3057\u3001\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u89e3\u6d88\u3057\u305f\u7d50\u679c\u3001git add \u3059\u308b\u3082\u306e\u304c\u306a\u304f\u306a\u3063\u3066\u3057\u307e\u3063\u305f\u5834\u5408\u3001git rebase --continue \u3059\u308b\u3068\u4ee5\u4e0b\u306e\u30a8\u30e9\u30fc\u30e1\u30c3\u30bb\u30fc\u30b8\u304c\u51fa\u307e\u3059\u3002 $ git rebase --continue \u2026","width":"100%","provider_name":"Hatena Blog","blog_title":"\u732b\u3067\u3082\u308f\u304b\u308bWeb\u958b\u767a\u30fb\u30d7\u30ed\u30b0\u30e9\u30df\u30f3\u30b0","html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fwww.utakata.work%2Fentry%2F20180119%2F1516323600\" title=\"git rebase --continue \u3057\u3088\u3046\u3068\u3057\u3066 No changes - did you forget to use &#39;git add&#39;? \u3068\u8a00\u308f\u308c\u305f\u3089\u3069\u3046\u3057\u305f\u3089\u3044\u3044\u306e\u304b - \u732b\u3067\u3082\u308f\u304b\u308bWeb\u958b\u767a\u30fb\u30d7\u30ed\u30b0\u30e9\u30df\u30f3\u30b0\" class=\"embed-card embed-blogcard\" scrolling=\"no\" frameborder=\"0\" style=\"display: block; width: 100%; height: 190px; max-width: 500px; margin: 10px 0px;\"></iframe>","image_url":"https://cdn-ak.f.st-hatena.com/images/fotolife/y/yoshiki_utakata/20180125/20180125113232.jpg","provider_url":"https://hatena.blog","author_name":"yoshiki_utakata","url":"https://www.utakata.work/entry/20180119/1516323600","author_url":"https://blog.hatena.ne.jp/yoshiki_utakata/","version":"1.0","height":"190","type":"rich"}