{"id":218,"date":"2025-12-23T22:40:15","date_gmt":"2025-12-23T14:40:15","guid":{"rendered":"http:\/\/38.246.253.12\/?p=218"},"modified":"2025-12-23T22:40:16","modified_gmt":"2025-12-23T14:40:16","slug":"github%e6%8e%a8%e9%80%81%e8%a2%ab%e6%8b%92%ef%bc%9f%e5%bc%ba%e5%88%b6%e6%8e%a8%e9%80%81%e7%bb%88%e6%9e%81%e8%a7%a3%e5%86%b3%e6%96%b9%e6%a1%88%ef%bc%88%e9%99%84%e9%81%bf%e5%9d%91%e6%8c%87%e5%8d%97","status":"publish","type":"post","link":"https:\/\/chukai.cc\/index.php\/2025\/12\/23\/github%e6%8e%a8%e9%80%81%e8%a2%ab%e6%8b%92%ef%bc%9f%e5%bc%ba%e5%88%b6%e6%8e%a8%e9%80%81%e7%bb%88%e6%9e%81%e8%a7%a3%e5%86%b3%e6%96%b9%e6%a1%88%ef%bc%88%e9%99%84%e9%81%bf%e5%9d%91%e6%8c%87%e5%8d%97\/","title":{"rendered":"GitHub\u63a8\u9001\u88ab\u62d2\uff1f\u5f3a\u5236\u63a8\u9001\u7ec8\u6781\u89e3\u51b3\u65b9\u6848\uff08\u9644\u907f\u5751\u6307\u5357\uff09"},"content":{"rendered":"\n<p>\u5e74\u672b\u8d76\u9879\u76ee\u63d0\u4ea4\u4ee3\u7801\uff0c\u5374\u88abGitHub\u63a8\u9001\u62a5\u9519\u53cd\u590d\u6298\u78e8\uff1f\u4ece<code>non-fast-forward<\/code>\u5230<code>refusing to merge unrelated histories<\/code>\uff0c\u518d\u5230\u7f51\u7edc\u8fde\u63a5\u91cd\u7f6e\uff0c\u5404\u79cd\u95ee\u9898\u5c42\u51fa\u4e0d\u7a77\u3002\u4eca\u5929\u5c31\u5206\u4eab\u4e00\u5957\u300c\u5f3a\u5236\u63a8\u9001\u300d\u89e3\u51b3\u65b9\u6848\uff0c\u5e2e\u4f60\u5feb\u901f\u641e\u5b9a\u63a8\u9001\u96be\u9898\uff0c\u5c24\u5176\u9002\u5408\u4e2a\u4eba\u4ed3\u5e93\u573a\u666f\uff01<\/p>\n\n\n\n<h2 class=\"wp-block-heading\">\u4e00\u3001\u63a8\u9001\u88ab\u62d2\u5e38\u89c1\u573a\u666f<\/h2>\n\n\n\n<p>\u5728\u6267\u884c<code>git push<\/code>\u65f6\uff0c\u82e5\u51fa\u73b0\u4ee5\u4e0b\u62a5\u9519\uff0c\u5927\u6982\u7387\u662f\u672c\u5730\u4e0e\u8fdc\u7a0b\u5206\u652f\u5b58\u5728\u51b2\u7a81\u6216\u5386\u53f2\u4e0d\u4e00\u81f4\uff1a<\/p>\n\n\n\n<ol start=\"1\" class=\"wp-block-list\">\n<li><code>error: failed to push some refs to 'xxx' (non-fast-forward)<\/code>\uff1a\u672c\u5730\u5206\u652f\u843d\u540e\u4e8e\u8fdc\u7a0b\uff0c\u8fdc\u7a0b\u6709\u672c\u5730\u6ca1\u6709\u7684\u63d0\u4ea4\u8bb0\u5f55\uff1b<\/li>\n\n\n\n<li><code>fatal: refusing to merge unrelated histories<\/code>\uff1a\u672c\u5730\u4e0e\u8fdc\u7a0b\u4ed3\u5e93\u5386\u53f2\u65e0\u5173\u8054\uff08\u5982\u672c\u5730\u521d\u59cb\u5316\u4ed3\u5e93\u540e\u76f4\u63a5\u63d0\u4ea4\uff0c\u672a\u514b\u9686\u8fdc\u7a0b\uff09\uff1b<\/li>\n\n\n\n<li><code>Recv failure: Connection was reset<\/code>\uff1aHTTPS\u534f\u8bae443\u7aef\u53e3\u88ab\u62e6\u622a\uff0c\u7f51\u7edc\u8fde\u63a5\u5f02\u5e38\u3002<\/li>\n<\/ol>\n\n\n\n<p>\u8fd9\u4e9b\u95ee\u9898\u5728\u4e2a\u4eba\u5f00\u53d1\u3001\u4e34\u65f6\u90e8\u7f72\u4ee3\u7801\u65f6\u5c24\u4e3a\u5e38\u89c1\uff0c\u6b64\u65f6\u300c\u5f3a\u5236\u63a8\u9001\u300d\u5c31\u662f\u6700\u9ad8\u6548\u7684\u89e3\u51b3\u65b9\u6848\u3002<\/p>\n\n\n\n<h2 class=\"wp-block-heading\">\u4e8c\u3001\u5f3a\u5236\u63a8\u9001\u6838\u5fc3\u65b9\u6848\uff08\u5206\u6b65\u64cd\u4f5c\uff09<\/h2>\n\n\n\n<h3 class=\"wp-block-heading\">1. \u9002\u7528\u573a\u666f\uff08\u5fc5\u770b\uff01\uff09<\/h3>\n\n\n\n<p>\u5f3a\u5236\u63a8\u9001\u4f1a\u76f4\u63a5\u8986\u76d6\u8fdc\u7a0b\u5206\u652f\u4ee3\u7801\uff0c\u52a1\u5fc5\u6ee1\u8db3\u4ee5\u4e0b\u6761\u4ef6\u518d\u4f7f\u7528\uff1a<\/p>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u4ed3\u5e93\u4e3a\u4e2a\u4eba\u6240\u6709\uff0c\u8fdc\u7a0b\u5206\u652f\u65e0\u91cd\u8981\u4ee3\u7801\uff08\u5982\u4ec5\u521d\u59cb\u5316\u63d0\u4ea4\u3001\u6d4b\u8bd5\u6587\u4ef6\uff09\uff1b<\/li>\n\n\n\n<li>\u786e\u8ba4\u672c\u5730\u4ee3\u7801\u662f\u6700\u7ec8\u7248\u672c\uff0c\u65e0\u9700\u4fdd\u7559\u8fdc\u7a0b\u5206\u652f\u7684\u5386\u53f2\u8bb0\u5f55\uff1b<\/li>\n\n\n\n<li>\u591a\u4eba\u534f\u4f5c\u4ed3\u5e93\u7981\u6b62\u968f\u610f\u4f7f\u7528\uff08\u4f1a\u8986\u76d6\u4ed6\u4eba\u63d0\u4ea4\uff0c\u9700\u5148\u540c\u6b65\u8fdc\u7a0b\u4ee3\u7801\uff09\u3002<\/li>\n<\/ul>\n\n\n\n<h3 class=\"wp-block-heading\">2. \u5177\u4f53\u64cd\u4f5c\u6b65\u9aa4\uff08Windows PowerShell\/\u7ec8\u7aef\u901a\u7528\uff09<\/h3>\n\n\n\n<h4 class=\"wp-block-heading\">\u6b65\u9aa41\uff1a\u8fdb\u5165\u9879\u76ee\u76ee\u5f55<\/h4>\n\n\n\n<p>\u6253\u5f00\u7ec8\u7aef\/ PowerShell\uff0c\u901a\u8fc7<code>cd<\/code>\u547d\u4ee4\u8fdb\u5165\u672c\u5730\u9879\u76ee\u6839\u76ee\u5f55\uff08\u786e\u4fdd\u76ee\u5f55\u4e0b\u6709<code>.git<\/code>\u6587\u4ef6\u5939\uff09\uff1a<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code># \u793a\u4f8b\uff1a\u8fdb\u5165\u684c\u9762\u9879\u76ee\u76ee\u5f55\ncd C:\\Users\\\u4f60\u7684\u7528\u6237\u540d\\Desktop\\\u9879\u76ee\u540d\u79f0<\/code><\/pre>\n\n\n\n<h4 class=\"wp-block-heading\">\u6b65\u9aa42\uff1a\u6267\u884c\u5f3a\u5236\u63a8\u9001\u547d\u4ee4<\/h4>\n\n\n\n<p>\u76f4\u63a5\u6267\u884c\u4ee5\u4e0b\u547d\u4ee4\uff0c\u5f3a\u5236\u5c06\u672c\u5730<code>main<\/code>\u5206\u652f\u63a8\u9001\u5230\u8fdc\u7a0b\uff08\u82e5\u8fdc\u7a0b\u5206\u652f\u4e3a<code>master<\/code>\uff0c\u66ff\u6362\u4e3a<code>master<\/code>\u5373\u53ef\uff09\uff1a<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code># \u5f3a\u5236\u63a8\u9001\u672c\u5730main\u5206\u652f\u5230\u8fdc\u7a0borigin\/main\ngit push origin main -f<\/code><\/pre>\n\n\n\n<p>\u53c2\u6570\u8bf4\u660e\uff1a<code>-f<\/code> \u662f<code>--force<\/code>\u7684\u7f29\u5199\uff0c\u4ee3\u8868\u5f3a\u5236\u63a8\u9001\uff0c\u4f1a\u8df3\u8fc7\u5206\u652f\u5386\u53f2\u4e00\u81f4\u6027\u68c0\u67e5\uff0c\u76f4\u63a5\u8986\u76d6\u8fdc\u7a0b\u4ee3\u7801\u3002<\/p>\n\n\n\n<h4 class=\"wp-block-heading\">\u6b65\u9aa43\uff1a\u9a8c\u8bc1\u63a8\u9001\u7ed3\u679c<\/h4>\n\n\n\n<p>\u82e5\u7ec8\u7aef\u8f93\u51fa\u4ee5\u4e0b\u5185\u5bb9\uff0c\u8bf4\u660e\u63a8\u9001\u6210\u529f\uff1a<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>Enumerating objects: 21, done.\nCounting objects: 100% (21\/21), done.\nDelta compression using up to 24 threads\nCompressing objects: 100% (6\/6), done.\nWriting objects: 100% (11\/11), 5.54 KiB | 2.77 MiB\/s, done.\nTotal 11 (delta 3), reused 0 (delta 0), pack-reused 0 (from 0)\nremote: Resolving deltas: 100% (3\/3), completed with 3 local objects.\nTo https:\/\/github.com\/\u4f60\u7684\u7528\u6237\u540d\/\u4ed3\u5e93\u540d\u79f0.git\n + 4c79e76...8a43534 main -&gt; main (forced update)<\/code><\/pre>\n\n\n\n<p>\u5173\u952e\u6807\u8bc6\uff1a<code>(forced update)<\/code> \u8868\u793a\u5f3a\u5236\u66f4\u65b0\u751f\u6548\uff0c\u524d\u9762\u7684<code>+<\/code>\u53f7\u4ee3\u8868\u5206\u652f\u66f4\u65b0\u6210\u529f\u3002<\/p>\n\n\n\n<h3 class=\"wp-block-heading\">3. \u7f51\u7edc\u9519\u8bef\u8865\u6551\u65b9\u6848<\/h3>\n\n\n\n<p>\u82e5\u6267\u884c\u5f3a\u5236\u63a8\u9001\u65f6\u51fa\u73b0\u300c\u7f51\u7edc\u8fde\u63a5\u91cd\u7f6e\u300d\u300c443\u7aef\u53e3\u65e0\u6cd5\u8fde\u63a5\u300d\u7b49\u9519\u8bef\uff0c\u5927\u6982\u7387\u662fHTTPS\u534f\u8bae\u7684\u95ee\u9898\uff0c\u53ef\u5207\u6362\u4e3aSSH\u534f\u8bae\uff1a<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code># 1. \u66ff\u6362\u8fdc\u7a0b\u4ed3\u5e93\u5730\u5740\u4e3aSSH\u534f\u8bae\uff08\u66ff\u6362\u4e3a\u4f60\u7684\u4ed3\u5e93SSH\u5730\u5740\uff09\ngit remote set-url origin git@github.com:\u4f60\u7684\u7528\u6237\u540d\/\u4ed3\u5e93\u540d\u79f0.git\n\n# 2. \u91cd\u65b0\u6267\u884c\u5f3a\u5236\u63a8\u9001\ngit push origin main -f<\/code><\/pre>\n\n\n\n<p>SSH\u534f\u8bae\u9700\u63d0\u524d\u914d\u7f6e\u5bc6\u94a5\uff08\u751f\u6210SSH\u5bc6\u94a5\u540e\uff0c\u5728GitHub\u4e2a\u4eba\u8bbe\u7f6e\u4e2d\u6dfb\u52a0\u516c\u94a5\u5373\u53ef\uff0c\u914d\u7f6e\u4e00\u6b21\u6c38\u4e45\u751f\u6548\uff09\uff0c\u5f7b\u5e95\u907f\u5f00HTTPS\u7684\u7f51\u7edc\u62e6\u622a\u95ee\u9898\u3002<\/p>\n\n\n\n<h2 class=\"wp-block-heading\">\u4e09\u3001\u907f\u5751\u6307\u5357\u4e0e\u540e\u7eed\u9884\u9632<\/h2>\n\n\n\n<h3 class=\"wp-block-heading\">1. \u5f3a\u5236\u63a8\u9001\u7684\u98ce\u9669\u63d0\u793a<\/h3>\n\n\n\n<p>\u591a\u4eba\u534f\u4f5c\u4ed3\u5e93\u7edd\u5bf9\u7981\u6b62\u76f4\u63a5\u5f3a\u5236\u63a8\u9001\uff01\u82e5\u9700\u540c\u6b65\u8fdc\u7a0b\u4ee3\u7801\uff0c\u5e94\u5148\u6267\u884c<code>git pull origin main --allow-unrelated-histories<\/code>\u5408\u5e76\u8fdc\u7a0b\u4ee3\u7801\uff0c\u89e3\u51b3\u51b2\u7a81\u540e\u518d\u63a8\u9001\uff0c\u907f\u514d\u8986\u76d6\u4ed6\u4eba\u63d0\u4ea4\u3002<\/p>\n\n\n\n<h3 class=\"wp-block-heading\">2. \u9884\u9632\u63a8\u9001\u5931\u8d25\u7684\u65e5\u5e38\u4e60\u60ef<\/h3>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u65b0\u5efa\u4ed3\u5e93\u65f6\uff0c\u5148\u901a\u8fc7<code>git clone<\/code>\u514b\u9686\u8fdc\u7a0b\u4ed3\u5e93\u5230\u672c\u5730\uff0c\u518d\u5728\u672c\u5730\u6dfb\u52a0\u4ee3\u7801\uff0c\u907f\u514d\u672c\u5730\u4e0e\u8fdc\u7a0b\u5386\u53f2\u65e0\u5173\u8054\uff1b<\/li>\n\n\n\n<li>\u65e5\u5e38\u63d0\u4ea4\u4ee3\u7801\u524d\uff0c\u5148\u6267\u884c<code>git pull<\/code>\u540c\u6b65\u8fdc\u7a0b\u6700\u65b0\u4ee3\u7801\uff0c\u51cf\u5c11\u51b2\u7a81\u6982\u7387\uff1b<\/li>\n\n\n\n<li>\u4f18\u5148\u4f7f\u7528SSH\u534f\u8bae\u64cd\u4f5cGitHub\uff0c\u907f\u5f00HTTPS\u7684\u9a8c\u8bc1\u548c\u7f51\u7edc\u95ee\u9898\u3002<\/li>\n<\/ul>\n\n\n\n<h2 class=\"wp-block-heading\">\u56db\u3001\u603b\u7ed3<\/h2>\n\n\n\n<p>\u5f3a\u5236\u63a8\u9001\u662f\u4e2a\u4eba\u4ed3\u5e93\u89e3\u51b3\u63a8\u9001\u88ab\u62d2\u7684\u300c\u7ec8\u6781\u65b9\u6848\u300d\uff0c\u5c24\u5176\u9002\u5408\u5e74\u672b\u8d76\u5de5\u3001\u4e34\u65f6\u90e8\u7f72\u4ee3\u7801\u7684\u573a\u666f\uff0c\u80fd\u5feb\u901f\u7ed5\u5f00\u5386\u53f2\u51b2\u7a81\u548c\u7f51\u7edc\u95ee\u9898\u3002\u4f46\u52a1\u5fc5\u7262\u8bb0\u9002\u7528\u573a\u666f\uff0c\u591a\u4eba\u534f\u4f5c\u65f6\u8c28\u614e\u64cd\u4f5c\uff0c\u907f\u514d\u9020\u6210\u4ee3\u7801\u4e22\u5931\u3002\u638c\u63e1\u8fd9\u5957\u65b9\u6cd5\uff0c\u5f80\u540eGitHub\u63a8\u9001\u518d\u4e5f\u4e0d\u7528\u88ab\u62a5\u9519\u6298\u78e8\u5566\uff01<\/p>\n\n\n\n<p><\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u5e74\u672b\u8d76\u9879\u76ee\u63d0\u4ea4\u4ee3\u7801\uff0c\u5374\u88abGitHub\u63a8\u9001\u62a5\u9519\u53cd\u590d\u6298\u78e8\uff1f\u4ecenon-fast-forward\u5230refusing t [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":219,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-218","post","type-post","status-publish","format-standard","has-post-thumbnail","hentry","category-passage"],"_links":{"self":[{"href":"https:\/\/chukai.cc\/index.php\/wp-json\/wp\/v2\/posts\/218","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/chukai.cc\/index.php\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/chukai.cc\/index.php\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/chukai.cc\/index.php\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/chukai.cc\/index.php\/wp-json\/wp\/v2\/comments?post=218"}],"version-history":[{"count":1,"href":"https:\/\/chukai.cc\/index.php\/wp-json\/wp\/v2\/posts\/218\/revisions"}],"predecessor-version":[{"id":220,"href":"https:\/\/chukai.cc\/index.php\/wp-json\/wp\/v2\/posts\/218\/revisions\/220"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/chukai.cc\/index.php\/wp-json\/wp\/v2\/media\/219"}],"wp:attachment":[{"href":"https:\/\/chukai.cc\/index.php\/wp-json\/wp\/v2\/media?parent=218"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/chukai.cc\/index.php\/wp-json\/wp\/v2\/categories?post=218"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/chukai.cc\/index.php\/wp-json\/wp\/v2\/tags?post=218"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}