{"id":5707,"date":"2022-10-11T13:15:16","date_gmt":"2022-10-11T04:15:16","guid":{"rendered":"https:\/\/www.chihayafuru.jp\/tech\/?p=5707"},"modified":"2025-02-04T10:46:12","modified_gmt":"2025-02-04T01:46:12","slug":"git-merge-base","status":"publish","type":"post","link":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/archives\/5707","title":{"rendered":"[git] merge-base"},"content":{"rendered":"<p>3-way-merge \u306b\u304a\u3051\u308b\uff12\u3064\u306e\u30b3\u30df\u30c3\u30c8\u306e\u5171\u901a\u306e\u7956\u5148\uff08\u2252\uff12\u3064\u306e\u30d6\u30e9\u30f3\u30c1\u306e\u5206\u5c90\u5143\uff09\u3092\u63a2\u3059\u3002<\/p>\n<p><img decoding=\"async\" src=\"https:\/\/chihayafuru.s3-ap-northeast-1.amazonaws.com\/imgs\/wp\/2022\/10\/git_merge_base.png\" alt=\"merge base\"><br \/>\n<!--more--><\/p>\n<h3>\u66f8\u5f0f<\/h3>\n<pre class=\"lang:default highlight:0 decode:true \" >git merge-base &lt;commit&gt; &lt;commit&gt;<\/pre>\n<p>&nbsp;<\/p>\n<h3>\u30b3\u30de\u30f3\u30c9\u4f8b<\/h3>\n<pre class=\"lang:default highlight:0 decode:true \" >$ git merge-base HEAD 59d6edb<\/pre>\n<pre class=\"lang:default highlight:0 decode:true \" >$ git merge-base main develop<\/pre>\n<p>&nbsp;<\/p>\n<h3>\u516c\u5f0f\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8<\/h3>\n<ul>\n<li><a href=\"https:\/\/git-scm.com\/docs\/git-merge-base\">git-merge-base<\/a><\/li>\n<\/ul>\n","protected":false},"excerpt":{"rendered":"<p>3-way-merge \u306b\u304a\u3051\u308b\uff12\u3064\u306e\u30b3\u30df\u30c3\u30c8\u306e\u5171\u901a\u306e\u7956\u5148\uff08\u2252\uff12\u3064\u306e\u30d6\u30e9\u30f3\u30c1\u306e\u5206\u5c90\u5143\uff09\u3092\u63a2\u3059\u3002<\/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-5707","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\/5707","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=5707"}],"version-history":[{"count":13,"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/posts\/5707\/revisions"}],"predecessor-version":[{"id":7847,"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/posts\/5707\/revisions\/7847"}],"wp:attachment":[{"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/media?parent=5707"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/categories?post=5707"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/tags?post=5707"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}