{"id":1365,"date":"2022-10-31T02:43:03","date_gmt":"2022-10-30T18:43:03","guid":{"rendered":"http:\/\/175.24.184.226\/?p=1365"},"modified":"2022-10-31T02:45:57","modified_gmt":"2022-10-30T18:45:57","slug":"%e8%af%a6%e8%a7%a3git-pull%e5%92%8cgit-fetch%e7%9a%84%e5%8c%ba%e5%88%ab","status":"publish","type":"post","link":"\/?p=1365","title":{"rendered":"\u8be6\u89e3git pull\u548cgit fetch\u7684\u533a\u522b"},"content":{"rendered":"<h2>\u524d\u8a00<\/h2>\n<p>\u5728\u6211\u4eec\u4f7f\u7528git\u7684\u65f6\u5019\u7528\u7684\u66f4\u65b0\u4ee3\u7801\u662fgit fetch\uff0cgit pull\u8fd9\u4e24\u6761\u6307\u4ee4\u3002\u4f46\u662f\u6709\u6ca1\u6709\u5c0f\u4f19\u4f34\u53bb\u601d\u8003\u8fc7\u8fd9\u4e24\u8005\u7684\u533a\u522b\u5462\uff1f\u6709\u7ecf\u9a8c\u7684\u4eba\u603b\u662f\u8bf4\u6700\u597d\u7528git fetch+git merge\uff0c\u4e0d\u5efa\u8bae\u7528git pull\u3002\u4e5f\u6709\u4eba\u8bf4git pull=git fetch+git merge\uff0c\u771f\u7684\u662f\u8fd9\u6837\u5417\uff1f\u4e3a\u4ec0\u4e48\u5462\uff1f\u65e2\u7136\u5982\u6b64\u4e3a\u4ec0\u4e48git\u8fd8\u8981\u63d0\u4f9b\u8fd9\u4e24\u79cd\u65b9\u5f0f\u5462\uff1f<\/p>\n<hr \/>\n<h3>1. \u76f8\u540c\u70b9<\/h3>\n<ul>\n<li>\u9996\u5148\u5728\u4f5c\u7528\u4e0a\u4ed6\u4eec\u7684\u529f\u80fd\u662f\u5927\u81f4\u76f8\u540c\u7684\uff0c\u90fd\u662f\u8d77\u5230\u4e86\u66f4\u65b0\u4ee3\u7801\u7684\u4f5c\u7528\u3002<\/li>\n<\/ul>\n<h3>2. \u4e0d\u540c\u70b9<\/h3>\n<p>\u5148\u8865\u5145\u4e00\u4e9bgit\u91cc\u9762\u76f8\u5173\u7684\u4e00\u4e9b\u77e5\u8bc6\uff1a<\/p>\n<ul>\n<li>\n<p>\u9996\u5148\u6211\u4eec\u8981\u8bf4\u7b80\u5355\u8bf4git\u7684\u8fd0\u884c\u673a\u5236\u3002git\u5206\u4e3a\u672c\u5730\u4ed3\u5e93\u548c\u8fdc\u7a0b\u4ed3\u5e93\uff0c\u6211\u4eec\u4e00\u822c\u60c5\u51b5\u90fd\u662f\u5199\u5b8c\u4ee3\u7801\uff0ccommit\u5230\u672c\u5730\u4ed3\u5e93\uff08\u751f\u6210\u672c\u5730\u4ed3\u7684commit ID\uff0c\u4ee3\u8868\u5f53\u524d\u63d0\u4ea4\u4ee3\u7801\u7684\u7248\u672c\u53f7\uff09\uff0c\u7136\u540epush\u5230\u8fdc\u7a0b\u4ed3\u5e93\uff08\u8bb0\u5f55\u8fd9\u4e2a\u7248\u672c\u53f7\uff09\uff0c\u8fd9\u4e2a\u6d41\u7a0b\u5927\u5bb6\u90fd\u719f\u6089\u3002<\/p>\n<\/li>\n<li>\n<p>\u6211\u4eec<strong>\u672c\u5730<\/strong>\u7684git\u6587\u4ef6\u5939\u91cc\u9762\u5bf9\u5e94\u4e5f\u5b58\u50a8\u4e86git\u672c\u5730\u4ed3\u5e93master\u5206\u652f\u7684commit ID \u548c \u8ddf\u8e2a\u7684\u8fdc\u7a0b\u5206\u652forign\/master\u7684commit ID\uff08\u53ef\u4ee5\u6709\u591a\u4e2a\u8fdc\u7a0b\u4ed3\u5e93\uff09\u3002\u90a3\u4ec0\u4e48\u662f\u8ddf\u8e2a\u7684\u8fdc\u7a0b\u5206\u652f\u5462\uff0c\u6253\u5f00git\u6587\u4ef6\u5939\u53ef\u4ee5\u770b\u5230\u5982\u4e0b\u6587\u4ef6\uff1a<\/p>\n<pre><code>.git\/refs\/head\/\\[\u672c\u5730\u5206\u652f\\]\n.git\/refs\/remotes\/\\[\u6b63\u5728\u8ddf\u8e2a\u7684\u5206\u652f\\]<\/code><\/pre>\n<\/li>\n<li>\n<p>\u5176\u4e2dhead\u5c31\u662f\u672c\u5730\u5206\u652f\uff0cremotes\u662f\u8ddf\u8e2a\u7684\u8fdc\u7a0b\u5206\u652f\uff0c\u8fd9\u4e2a\u7c7b\u578b\u7684\u5206\u652f\u5728\u67d0\u79cd\u7c7b\u578b\u4e0a\u662f\u5341\u5206\u76f8\u4f3c\u7684\uff0c\u4ed6\u4eec\u90fd\u662f\u8868\u793a\u63d0\u4ea4\u7684SHA1\u6821\u9a8c\u548c\uff08\u5c31\u662fcommitID\uff09\u3002<\/p>\n<\/li>\n<li>\n<p><strong>\u4f46\u662f\uff0c\u4e0d\u7ba1\u4ed6\u4eec\u662f\u5982\u4f55\u7684\u76f8\u4f3c\uff0c\u4ed6\u4eec\u8fd8\u662f\u6709\u4e00\u4e2a\u91cd\u5927\u7684\u533a\u522b\uff1a<\/strong><\/p>\n<\/li>\n<li>\n<p><strong>\u66f4\u6539\u8fdc\u7aef\u8ddf\u8e2a\u5206\u652f\u53ea\u80fd\u7528git fetch\uff0c\u6216\u8005\u662fgit push\u540e\u4f5c\u4e3a\u526f\u4ea7\u54c1\uff08side-effect\uff09\u6765\u6539\u53d8\u3002\u6211\u4eec\u65e0\u6cd5\u76f4\u63a5\u5bf9\u8fdc\u7a0b\u8ddf\u8e2a\u5206\u652f\u64cd\u4f5c\uff0c\u6211\u4eec\u5fc5\u987b\u5148\u5207\u56de\u672c\u5730\u5206\u652f\u7136\u540e\u521b\u5efa\u4e00\u4e2a\u65b0\u7684commit\u63d0\u4ea4<\/strong>\u3002<br \/>\n<img src=\"https:\/\/lemon-guess.oss-cn-hangzhou.aliyuncs.com\/img\/70.png\" alt=\"\u5728\u8fd9\u91cc\u63d2\u5165\u56fe\u7247\u63cf\u8ff0\" \/><\/p>\n<\/li>\n<li>\n<p>\u9996\u5148\u5047\u8bbe\u6211\u4eec\u672c\u5730\u4ed3\u5e93\u7684 master \u5206\u652f\u4e0a commit ID =1 \uff0corign\/mastter\u4e2d\u7684commit ID =1 ;\u8fd9\u65f6\u5019\u8fdc\u7a0b\u4ed3\u5e93\u6709\u4eba\u66f4\u65b0\u4e86github ogirn\u5e93\u4e2dmaster\u5206\u652f\u4e0a\u7684\u4ee3\u7801\uff0c\u65b0\u7684\u4ee3\u7801\u7248\u672c\u53f7commit ID =2 ,\u90a3\u4e48\u5728github\u4e0a orign\/master\u7684commitID=2\uff0c\u7136\u540e\u6211\u4eec\u8981\u66f4\u65b0\u4ee3\u7801\u3002<br \/>\n<img src=\"https:\/\/lemon-guess.oss-cn-hangzhou.aliyuncs.com\/img\/70-1667155331601-3.png\" alt=\"\u5728\u8fd9\u91cc\u63d2\u5165\u56fe\u7247\u63cf\u8ff0\" \/><\/p>\n<\/li>\n<\/ul>\n<h2>1. git fetch<\/h2>\n<ul>\n<li><strong>\u4f7f\u7528git fetch\u66f4\u65b0\u4ee3\u7801\uff0c\u672c\u5730\u7684\u5e93\u4e2dmaster\u7684commitID\u4e0d\u53d8\uff0c\u8fd8\u662f\u7b49\u4e8e1\u3002\u4f46\u662f\u4e0egit\u4e0a\u9762\u5173\u8054\u7684\u90a3\u4e2aorign\/master\u7684commit ID\u53d8\u6210\u4e862<\/strong>\u3002\u8fd9\u65f6\u5019\u6211\u4eec\u672c\u5730\u76f8\u5f53\u4e8e\u5b58\u50a8\u4e86\u4e24\u4e2a\u4ee3\u7801\u7684\u7248\u672c\u53f7\uff0c\u6211\u4eec\u8fd8\u8981\u901a\u8fc7merge\u53bb\u5408\u5e76\u8fd9\u4e24\u4e2a\u4e0d\u540c\u7684\u4ee3\u7801\u7248\u672c\uff0c\u5982\u679c\u8fd9\u4e24\u4e2a\u7248\u672c\u90fd\u4fee\u6539\u4e86\u540c\u4e00\u5904\u7684\u4ee3\u7801\uff0c\u8fd9\u65f6\u5019merge\u5c31\u4f1a\u51fa\u73b0\u51b2\u7a81\uff0c\u7136\u540e\u6211\u4eec\u89e3\u51b3\u51b2\u7a81\u4e4b\u540e\u5c31\u751f\u6210\u4e86\u4e00\u4e2a\u65b0\u7684\u4ee3\u7801\u7248\u672c\u3002<\/li>\n<li><strong>\u8fd9\u65f6\u5019\u672c\u5730\u7684\u4ee3\u7801\u7248\u672c\u53ef\u80fd\u5c31\u53d8\u6210\u4e86commit ID=3\uff0c\u5373\u751f\u6210\u4e86\u4e00\u4e2a\u65b0\u7684\u4ee3\u7801\u7248\u672c\u3002<\/strong><br \/>\n<img src=\"https:\/\/lemon-guess.oss-cn-hangzhou.aliyuncs.com\/img\/70-1667155337430-6.png\" alt=\"\u5728\u8fd9\u91cc\u63d2\u5165\u56fe\u7247\u63cf\u8ff0\" \/><\/li>\n<li><strong>\u76f8\u5f53\u4e8efetch\u7684\u65f6\u5019\u672c\u5730\u7684master\u6ca1\u6709\u53d8\u5316\uff0c\u4f46\u662f\u4e0e\u8fdc\u7a0b\u4ed3\u5173\u8054\u7684\u90a3\u4e2a\u7248\u672c\u53f7\u88ab\u66f4\u65b0\u4e86\uff0c\u6211\u4eec\u63a5\u4e0b\u6765\u5c31\u662f\u5728\u672c\u5730\u5408\u5e76\u8fd9\u4e24\u4e2a\u7248\u672c\u53f7\u7684\u4ee3\u7801\u3002<\/strong><\/li>\n<\/ul>\n<h2>2. git pull<\/h2>\n<ul>\n<li>\u662f\u7528git pull\u66f4\u65b0\u4ee3\u7801\u7684\u8bdd\u5c31\u6bd4\u8f83\u7b80\u5355\u66b4\u529b\u4e86\uff0c\u770b\u4e0b\u56fe\u3002<br \/>\n<img src=\"https:\/\/lemon-guess.oss-cn-hangzhou.aliyuncs.com\/img\/70-1667155341749-9.png\" alt=\"\u5728\u8fd9\u91cc\u63d2\u5165\u56fe\u7247\u63cf\u8ff0\" \/><br \/>\n<strong>\u4f7f\u7528git pull\u7684\u4f1a\u5c06\u672c\u5730\u7684\u4ee3\u7801\u66f4\u65b0\u81f3\u8fdc\u7a0b\u4ed3\u5e93\u91cc\u9762\u6700\u65b0\u7684\u4ee3\u7801\u7248\u672c<\/strong><\/li>\n<\/ul>\n<h2>3. \u603b\u7ed3<\/h2>\n<ul>\n<li><strong>\u7531\u6b64\u53ef\u89c1\uff0cgit pull\u770b\u8d77\u6765\u50cfgit fetch+get merge\uff0c\u4f46\u662f\u6839\u636ecommit ID\u6765\u770b\u7684\u8bdd\uff0c\u4ed6\u4eec\u5b9e\u9645\u7684\u5b9e\u73b0\u539f\u7406\u662f\u4e0d\u4e00\u6837\u7684\u3002<\/strong><\/li>\n<li>\u8fd9\u91cc\u501f\u7528\u4e4b\u524d\u6587\u732e\u770b\u5230\u7684\u4e00\u53e5\u8bdd\uff1a\n<pre><code>> \u4e0d\u8981\u7528git pull\uff0c\u7528git fetch\u548cgit merge\u4ee3\u66ff\u5b83\u3002\n>\n> git pull\u7684\u95ee\u9898\u662f\u5b83\u628a\u8fc7\u7a0b\u7684\u7ec6\u8282\u90fd\u9690\u85cf\u4e86\u8d77\u6765\uff0c\u4ee5\u81f3\u4e8e\u4f60\u4e0d\u7528\u53bb\u4e86\u89e3git\u4e2d\u5404\u79cd\u7c7b\u578b\u5206\u652f\u7684\u533a\u522b\u548c\u4f7f\u7528\u65b9\u6cd5\u3002\u5f53\u7136\uff0c\u591a\u6570\u65f6\u5019\u8fd9\u662f\u6ca1\u95ee\u9898\u7684\uff0c\u4f46\u4e00\u65e6\u4ee3\u7801\u6709\u95ee\u9898\uff0c\u4f60\u5f88\u96be\u627e\u5230\u51fa\u9519\u7684\u5730\u65b9\u3002\u770b\u8d77\u6765git pull\u7684\u7528\u6cd5\u4f1a\u4f7f\u4f60\u5403\u60ca\uff0c\u7b80\u5355\u770b\u4e00\u4e0bgit\u7684\u4f7f\u7528\u6587\u6863\u5e94\u8be5\u5c31\u80fd\u8bf4\u670d\u4f60\u3002\n>\n> \u5c06\u4e0b\u8f7d\uff08fetch\uff09\u548c\u5408\u5e76\uff08merge\uff09\u653e\u5230\u4e00\u4e2a\u547d\u4ee4\u91cc\u7684\u53e6\u5916\u4e00\u4e2a\u5f0a\u7aef\u662f\uff0c\u4f60\u7684\u672c\u5730\u5de5\u4f5c\u76ee\u5f55\u5728\u672a\u7ecf\u786e\u8ba4\u7684\u60c5\u51b5\u4e0b\u5c31\u4f1a\u88ab\u8fdc\u7a0b\u5206\u652f\u66f4\u65b0\u3002\u5f53\u7136\uff0c\u9664\u975e\u4f60\u5173\u95ed\u6240\u6709\u7684\u5b89\u5168\u9009\u9879\uff0c\u5426\u5219git pull\u5728\u4f60\u672c\u5730\u5de5\u4f5c\u76ee\u5f55\u8fd8\u4e0d\u81f3\u4e8e\u9020\u6210\u4e0d\u53ef\u633d\u56de\u7684\u635f\u5931\uff0c\u4f46\u5f88\u591a\u65f6\u5019\u6211\u4eec\u5b81\u613f\u505a\u7684\u6162\u4e00\u4e9b\uff0c\u4e5f\u4e0d\u613f\u610f\u8fd4\u5de5\u91cd\u6765\u3002<\/code><\/pre>\n<\/li>\n<\/ul>\n<p>\u672c\u6587\u8f6c\u81ea <a href=\"https:\/\/blog.csdn.net\/weixin_41975655\/article\/details\/82887273\">https:\/\/blog.csdn.net\/weixin_41975655\/article\/details\/82887273<\/a>\uff0c\u5982\u6709\u4fb5\u6743\uff0c\u8bf7\u8054\u7cfb\u5220\u9664\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u524d\u8a00 \u5728\u6211\u4eec\u4f7f\u7528git\u7684\u65f6\u5019\u7528\u7684\u66f4\u65b0\u4ee3\u7801\u662fgit fetch\uff0cgit pull\u8fd9\u4e24\u6761\u6307\u4ee4\u3002\u4f46\u662f\u6709\u6ca1\u6709\u5c0f\u4f19\u4f34\u53bb\u601d\u8003\u8fc7\u8fd9\u4e24\u8005\u7684\u533a\u522b\u5462\uff1f\u6709\u7ecf\u9a8c   \u2026 &#8230;<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"ngg_post_thumbnail":0},"categories":[10],"tags":[8],"_links":{"self":[{"href":"\/index.php?rest_route=\/wp\/v2\/posts\/1365"}],"collection":[{"href":"\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=1365"}],"version-history":[{"count":3,"href":"\/index.php?rest_route=\/wp\/v2\/posts\/1365\/revisions"}],"predecessor-version":[{"id":1368,"href":"\/index.php?rest_route=\/wp\/v2\/posts\/1365\/revisions\/1368"}],"wp:attachment":[{"href":"\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=1365"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=1365"},{"taxonomy":"post_tag","embeddable":true,"href":"\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=1365"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}