{"id":8651,"date":"2026-04-27T14:24:46","date_gmt":"2026-04-27T05:24:46","guid":{"rendered":"https:\/\/www.chihayafuru.jp\/tech\/?p=8651"},"modified":"2026-04-27T15:36:43","modified_gmt":"2026-04-27T06:36:43","slug":"git-%e3%82%ab%e3%83%ac%e3%83%b3%e3%83%88%e3%83%96%e3%83%a9%e3%83%b3%e3%83%81%e3%81%a8%e3%83%9e%e3%83%bc%e3%82%b8%e3%83%96%e3%83%a9%e3%83%b3%e3%83%81","status":"publish","type":"post","link":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/archives\/8651","title":{"rendered":"[git] \u30ab\u30ec\u30f3\u30c8\u30d6\u30e9\u30f3\u30c1\u3068\u30de\u30fc\u30b8\u30d6\u30e9\u30f3\u30c1"},"content":{"rendered":"<p>git merge\u30b3\u30de\u30f3\u30c9\u306b\u304a\u3051\u308b\u30ab\u30ec\u30f3\u30c8\u30fb\u30d6\u30e9\u30f3\u30c1\u3068\u30de\u30fc\u30b8\u30fb\u30d6\u30e9\u30f3\u30c1\u306e\u95a2\u4fc2<\/p>\n<p><img decoding=\"async\" src=\"https:\/\/chihayafuru.s3-ap-northeast-1.amazonaws.com\/imgs\/wp\/2026\/04\/git_ours_theirs.png\" alt=\"git merge branch\"><\/p>\n<h3>Conflict\u89e3\u6d88\u64cd\u4f5c\u306e\u4f8b<\/h3>\n<pre class=\"lang:default decode:true \" >$ git merge fix\/foo_range\r\n\r\n### \u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u767a\u751f ###\r\n\r\n$ git checkout --ours foo_module.c  # \u300c\u73fe\u5728\u306e\u5909\u66f4\u300d\u3067\u30ef\u30fc\u30af\u3092\u4e0a\u66f8\u304d\u3059\u308b\r\n\r\n$ git add foo_module.c  # \u300c\u30ef\u30fc\u30af\u300d=\u300c\u73fe\u5728\u306e\u5909\u66f4\u300d\u3092\u30b9\u30c6\u30fc\u30b8\u30f3\u30b0\u3059\u308b\r\n\r\n$ git commit -m \"\u30b3\u30df\u30c3\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8\"<\/pre>\n","protected":false},"excerpt":{"rendered":"<p>git merge\u30b3\u30de\u30f3\u30c9\u306b\u304a\u3051\u308b\u30ab\u30ec\u30f3\u30c8\u30fb\u30d6\u30e9\u30f3\u30c1\u3068\u30de\u30fc\u30b8\u30fb\u30d6\u30e9\u30f3\u30c1\u306e\u95a2\u4fc2 Conflict\u89e3\u6d88\u64cd\u4f5c\u306e\u4f8b $ git merge fix\/foo_range ### \u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u767a\u751f ### $ git checkou [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[3],"tags":[2],"class_list":["post-8651","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\/8651","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=8651"}],"version-history":[{"count":11,"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/posts\/8651\/revisions"}],"predecessor-version":[{"id":8663,"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/posts\/8651\/revisions\/8663"}],"wp:attachment":[{"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/media?parent=8651"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/categories?post=8651"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/tags?post=8651"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}