{"id":10008424,"date":"2024-03-05T11:20:35","date_gmt":"2024-03-05T03:20:35","guid":{"rendered":"https:\/\/blog.itmax.cn\/?p=10008424"},"modified":"2024-03-05T11:20:35","modified_gmt":"2024-03-05T03:20:35","slug":"fatal-refusing-to-merge-unrelated-histories","status":"publish","type":"post","link":"https:\/\/itmax.cn\/?p=10008424","title":{"rendered":"fatal: refusing to merge unrelated histories"},"content":{"rendered":"<h2>\u539f\u56e0<\/h2>\n<p><code>git<\/code>\u8ba4\u4e3a\u4f60\u8bd5\u56fe<code>merge<\/code>\u4e24\u4efd\u6570\u636e\u7684<code>commit<\/code>\u5386\u53f2\u662f\u5b8c\u5168\u4e0d\u60f3\u5173\u7684\uff0c\u6240\u4ee5\u62d2\u7edd\u64cd\u4f5c\u3002<\/p>\n<h2>\u89e3\u6cd5<\/h2>\n<p>\u660e\u786e\u544a\u8bc9<code>git<\/code>\uff0c\u4f60\u6240\u64cd\u4f5c\u7684\u6570\u636e\u662f\u76f8\u5173\u7684\u3002<\/p>\n<pre><code class=\"bash\">git pull --allow-unrelated-histories<\/code><\/pre>\n<h2>\u5176\u5b83<\/h2>\n<h3>\u540e\u7eed\u5982\u4f55\u907f\u514d\u8fd9\u4e2a\u9519\u8bef\uff1f<\/h3>\n<p>\u907f\u514d\u5bf9\u4e00\u4e2a\u5df2\u7ecf\u6709\u81ea\u5df1<code>commit<\/code>\u5386\u53f2\u7684\u672c\u5730\u4ed3\u5e93\u6267\u884c<code>git pull<\/code>\u4ee5\u62c9\u53d6\u4e00\u4e2a\u62e5\u6709\u4e0d\u540c<code>commit<\/code>\u5386\u53f2\u7684\u8fdc\u7a0b\u4ed3\u5e93\u3002<\/p>\n<p><a href=\"https:\/\/segmentfault.com\/a\/1190000044681795\">https:\/\/segmentfault.com\/a\/1190000044681795<\/a><\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u539f\u56e0 git\u8ba4\u4e3a\u4f60\u8bd5\u56femerge\u4e24\u4efd\u6570\u636e\u7684commit\u5386\u53f2\u662f\u5b8c\u5168\u4e0d\u60f3\u5173\u7684\uff0c\u6240\u4ee5\u62d2\u7edd\u64cd\u4f5c\u3002 \u89e3\u6cd5 \u660e\u786e\u544a\u8bc9git [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"_jetpack_memberships_contains_paid_content":false,"footnotes":""},"categories":[4],"tags":[],"class_list":["post-10008424","post","type-post","status-publish","format-standard","hentry","category-share"],"jetpack_sharing_enabled":true,"jetpack_featured_media_url":"","_links":{"self":[{"href":"https:\/\/itmax.cn\/index.php?rest_route=\/wp\/v2\/posts\/10008424","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/itmax.cn\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/itmax.cn\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/itmax.cn\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/itmax.cn\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=10008424"}],"version-history":[{"count":0,"href":"https:\/\/itmax.cn\/index.php?rest_route=\/wp\/v2\/posts\/10008424\/revisions"}],"wp:attachment":[{"href":"https:\/\/itmax.cn\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=10008424"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/itmax.cn\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=10008424"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/itmax.cn\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=10008424"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}