{"id":1087,"date":"2016-08-26T20:02:39","date_gmt":"2016-08-26T11:02:39","guid":{"rendered":"http:\/\/www.chihayafuru.jp\/tech\/?p=1087"},"modified":"2024-09-20T09:55:38","modified_gmt":"2024-09-20T00:55:38","slug":"git-rebase-%e3%81%a7-conflict-%e3%81%97%e3%81%9f%e3%81%a8%e3%81%8d%e3%81%ae%e3%83%9e%e3%83%8b%e3%83%a5%e3%82%a2%e3%83%ab%e7%b7%a8%e9%9b%86%e3%81%ab%e3%82%88%e3%82%8b%e8%a7%a3%e6%b6%88","status":"publish","type":"post","link":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/archives\/1087","title":{"rendered":"[git] rebase \u306b\u304a\u3051\u308b conflict \u306e\u30de\u30cb\u30e5\u30a2\u30eb\u7de8\u96c6\u306b\u3088\u308b\u89e3\u6d88\u65b9\u6cd5"},"content":{"rendered":"<h3>1. conflict(\u7af6\u5408)\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u3092\u30de\u30cb\u30e5\u30a2\u30eb\u3067\u7de8\u96c6\u3059\u308b<\/h3>\n<h4>\u30de\u30cb\u30e5\u30a2\u30eb\u7de8\u96c6\u3067\u4fee\u6b63\u3059\u3079\u304d\u7af6\u5408\u7b87\u6240\u306e\u4f8b<\/h4>\n<pre class=\"lang:default highlight:0 decode:true \" >&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD\r\n  printf(\"Hello\");\r\n=======\r\n  printf(\"Bye\");\r\n&gt;&gt;&gt;&gt;&gt;&gt;&gt;<\/pre>\n<p><!--more--><\/p>\n<h3>2. \u7de8\u96c6\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u3092\u30b9\u30c6\u30fc\u30b8\u30f3\u30b0\u306b\u8ffd\u52a0\u3059\u308b<\/h3>\n<pre class=\"lang:sh decode:true \" >$ git add xxxxxx.h\r\n\r\n$ git add xxxxxx.c<\/pre>\n<h3>3. \u30b3\u30f3\u30c6\u30a3\u30cb\u30e5\u30fc\u3092\u5b9f\u884c\u3059\u308b<\/h3>\n<pre class=\"lang:sh decode:true \" >$ git rebase --continue<\/pre>\n<h3>4. \u7e70\u308a\u8fd4\u3057<\/h3>\n<p>rebase\u306e\u3070\u3042\u3044\u306f\u3001\u300c\u7de8\u96c6\u300d &rArr; \u300c\u30b9\u30c6\u30fc\u30b8\u30f3\u30b0\u300d &rArr; \u300c\u30b3\u30f3\u30c6\u30a3\u30cb\u30e5\u30fc\u300d \u3092\uff08\u8907\u6570\u306e\u30b3\u30df\u30c3\u30c8\u306e\u7af6\u5408\u5206\uff09\u7e70\u308a\u8fd4\u3059\u5fc5\u8981\u304c\u3042\u308b\u30b1\u30fc\u30b9\u3082\u3042\u308a\u3046\u308b\u3002<\/p>\n<hr>\n<h3>\u5185\u90e8\u30ea\u30f3\u30af<\/h3>\n<ul>\n<li><a href=\"\/tech\/index.php\/archives\/7288\">[git] rebase<\/a><\/li>\n<\/ul>\n","protected":false},"excerpt":{"rendered":"<p>1. conflict(\u7af6\u5408)\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u3092\u30de\u30cb\u30e5\u30a2\u30eb\u3067\u7de8\u96c6\u3059\u308b \u30de\u30cb\u30e5\u30a2\u30eb\u7de8\u96c6\u3067\u4fee\u6b63\u3059\u3079\u304d\u7af6\u5408\u7b87\u6240\u306e\u4f8b &lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD printf(&#8220;Hello&#8221;); ====== [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[3],"tags":[2],"class_list":["post-1087","post","type-post","status-publish","format-standard","hentry","category-memo","tag-git"],"_links":{"self":[{"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/posts\/1087","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/comments?post=1087"}],"version-history":[{"count":10,"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/posts\/1087\/revisions"}],"predecessor-version":[{"id":7293,"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/posts\/1087\/revisions\/7293"}],"wp:attachment":[{"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/media?parent=1087"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/categories?post=1087"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/tags?post=1087"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}