{"provider_url":"https://hatena.blog","height":"190","categories":["Linux","PC","Tips","git","gerrit"],"author_name":"moguriso","width":"100%","image_url":null,"title":"gerrit-cherry-pick\u306econflict\u89e3\u6d88","provider_name":"Hatena Blog","published":"2015-07-13 02:59:25","type":"rich","description":"\u6975\u8ad6\u3001\">>...\"\u307e\u3067\u3092\u624b\u3067\u76f4\u3057\u3066\u304b\u3089 $ git add $ git commit (\u3082\u3057\u304f\u306f amend) \u3057\u3066push\u3057\u306a\u304a\u305b\u3068\u3044\u3046\u3053\u3068\u4f55\u3067\u3057\u3087\u3046\u304c\u3002git cherry-pick\u3067\u8d77\u304d\u3066\u3057\u307e\u3063\u305fconflict\u306e\u89e3\u6d88\u65b9\u6cd5\u3010--ours\u3001--theirs\u3011 - naiki.hatenablog.com\u307e\u305a status \u78ba\u8a8d\u3057\u3066 $ git status On branch telepathy Your branch is up-to-date with 'hogehoge'. You are currently rebasing. (fix conflicts and then ru\u2026","author_url":"https://blog.hatena.ne.jp/moguriso/","blog_url":"https://blog.tizen.moe/","html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fblog.tizen.moe%2Fentry%2F2015%2F07%2F14%2F025925\" title=\"gerrit-cherry-pick\u306econflict\u89e3\u6d88 - tizen.moe\" class=\"embed-card embed-blogcard\" scrolling=\"no\" frameborder=\"0\" style=\"display: block; width: 100%; height: 190px; max-width: 500px; margin: 10px 0px;\"></iframe>","url":"https://blog.tizen.moe/entry/2015/07/14/025925","version":"1.0","blog_title":"tizen.moe"}