{"id":19136,"date":"2024-11-19T08:55:14","date_gmt":"2024-11-19T00:55:14","guid":{"rendered":"https:\/\/fwq.ai\/blog\/19136\/"},"modified":"2024-11-19T08:55:14","modified_gmt":"2024-11-19T00:55:14","slug":"%e5%a6%82%e4%bd%95%e5%a4%84%e7%90%86git-pull%e5%91%bd%e4%bb%a4%e5%88%a0%e9%99%a4%e7%9a%84%e6%96%87%e4%bb%b6","status":"publish","type":"post","link":"https:\/\/fwq.ai\/blog\/19136\/","title":{"rendered":"\u5982\u4f55\u5904\u7406\u201cgit pull\u201d\u547d\u4ee4\u5220\u9664\u7684\u6587\u4ef6"},"content":{"rendered":"<p>git\u662f\u4e00\u6b3e\u975e\u5e38\u5f3a\u5927\u7684\u7248\u672c\u63a7\u5236\u5de5\u5177\uff0c\u5b83\u8ba9\u56e2\u961f\u5f00\u53d1\u66f4\u52a0\u4fbf\u5229\u548c\u9ad8\u6548\u3002\u5728\u4f7f\u7528git\u65f6\uff0c\u7ecf\u5e38\u4f1a\u7528\u5230\u62c9\u53d6\u4ee3\u7801\u7684\u547d\u4ee4\u2014\u2014\u201cgit pull\u201d\u3002\u8fd9\u4e2a\u547d\u4ee4\u901a\u5e38\u7528\u4e8e\u66f4\u65b0\u4ee3\u7801\u3001\u83b7\u53d6\u6700\u65b0\u4ee3\u7801\u7b49\u573a\u666f\uff0c\u4f46\u662f\u4f60\u53ef\u80fd\u4f1a\u9047\u5230\u4e00\u4e2a\u95ee\u9898\uff1a\u5f53\u4f60\u4f7f\u7528\u201cgit pull\u201d\u547d\u4ee4\u62c9\u53d6\u4ee3\u7801\u65f6\uff0c\u53d1\u73b0\u67d0\u4e2a\u6587\u4ef6\u4e0d\u89c1\u4e86\u3002\u8fd9\u79cd\u60c5\u51b5\u4e0b\uff0c\u4f60\u5e94\u8be5\u600e\u4e48\u505a\u5462\uff1f\u672c\u6587\u5c06\u8be6\u7ec6\u4ecb\u7ecd\u5982\u4f55\u5904\u7406\u201cgit pull\u201d\u547d\u4ee4\u5220\u9664\u7684\u6587\u4ef6\u3002<\/p>\n<h2>1. \u5220\u9664\u7684\u60c5\u5f62<\/h2>\n<p>\u5728\u4f7f\u7528\u201cgit pull\u201d\u547d\u4ee4\u62c9\u53d6\u4ee3\u7801\u65f6\uff0c\u5982\u679c\u53d1\u73b0\u67d0\u4e2a\u6587\u4ef6\u5728\u672c\u5730\u51fa\u73b0\u5220\u9664\uff0c\u90a3\u4e48\u5f88\u6709\u53ef\u80fd\u662f\u56e0\u4e3a\u8be5\u6587\u4ef6\u5728\u8fdc\u7a0b\u4ee3\u7801\u5e93\u4e2d\u4e5f\u88ab\u5220\u9664\u4e86\u3002\u6b64\u65f6\uff0c\u4f60\u9700\u8981\u660e\u786e\u4ee5\u4e0b\u4e24\u4e2a\u95ee\u9898\uff1a<\/p>\n<ul>\n<li>\u8be5\u6587\u4ef6\u662f\u5426\u786e\u5b9e\u88ab\u5220\u9664\u4e86\uff1f<\/li>\n<li>\u5982\u679c\u786e\u5b9e\u88ab\u5220\u9664\u4e86\uff0c\u4f60\u662f\u5426\u771f\u7684\u9700\u8981\u8be5\u6587\u4ef6\uff1f<\/li>\n<\/ul>\n<p>\u5982\u679c\u4f60\u786e\u5b9a\u8be5\u6587\u4ef6\u4e0d\u5e94\u8be5\u88ab\u5220\u9664\uff0c\u90a3\u4e48\u4f60\u9700\u8981\u627e\u56de\u5b83\u3002<\/p>\n<h2>2. \u627e\u56de\u88ab\u5220\u9664\u7684\u6587\u4ef6<\/h2>\n<p>\u5728\u6267\u884c\u201cgit pull\u201d\u547d\u4ee4\u540e\uff0c\u5982\u679c\u53d1\u73b0\u67d0\u4e2a\u6587\u4ef6\u88ab\u5220\u9664\u4e86\uff0c\u90a3\u4e48\u53ef\u4ee5\u901a\u8fc7\u4ee5\u4e0b\u64cd\u4f5c\u627e\u56de\u8be5\u6587\u4ef6\uff1a<\/p>\n<h3>2.1 \u6062\u590d\u6587\u4ef6\u5230\u6700\u65b0\u7248\u672c<\/h3>\n<p>\u5728\u4f7f\u7528\u201cgit pull\u201d\u547d\u4ee4\u62c9\u53d6\u4ee3\u7801\u65f6\uff0c\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u5f3a\u5236\u8986\u76d6\u672c\u5730\u5185\u5bb9\uff1a<\/p>\n<pre>git fetch --all  \ngit reset --hard origin\/master<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p>\u8fd9\u4e24\u884c\u547d\u4ee4\u53ef\u4ee5\u5f3a\u5236\u5c06\u672c\u5730\u7684\u6587\u4ef6\u8986\u76d6\u4e3a\u8fdc\u7a0b\u4ee3\u7801\u5e93\u7684\u6700\u65b0\u7248\u672c\u3002\u4f46\u662f\u9700\u8981\u6ce8\u610f\u7684\u662f\uff0c\u8fd9\u6837\u4f1a\u5bfc\u81f4\u672c\u5730\u672a\u63d0\u4ea4\u7684\u4ee3\u7801\u4e22\u5931\uff0c\u8bf7\u5728\u64cd\u4f5c\u524d\u5907\u4efd\u597d\u672c\u5730\u7684\u4ee3\u7801\u3002<\/p>\n<h3>2.2 \u4ece\u5386\u53f2\u7248\u672c\u4e2d\u627e\u56de\u6587\u4ef6<\/h3>\n<p>\u5982\u679c\u4f60\u5df2\u7ecf\u63d0\u4ea4\u4e86\u8be5\u6587\u4ef6\uff0c\u5e76\u4e14\u5728\u8fdc\u7a0b\u4ee3\u7801\u5e93\u4e2d\u4e5f\u88ab\u5220\u9664\u4e86\uff0c\u90a3\u4e48\u53ef\u4ee5\u6309\u7167\u4ee5\u4e0b\u6b65\u9aa4\u627e\u56de\u8be5\u6587\u4ef6\uff1a<\/p>\n<ol>\n<li>\n<p>\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u67e5\u770b\u8be5\u6587\u4ef6\u7684\u5386\u53f2\u7248\u672c\uff1a<\/p>\n<pre>git log -- &lt;filename&gt;<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236  <\/li>\n<li>\n<p>\u9009\u62e9\u4f60\u9700\u8981\u8fd8\u539f\u7684\u5386\u53f2\u7248\u672c\uff0c\u5e76\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u8fd8\u539f\u7248\u672c\uff1a<\/p>\n<pre>git checkout &lt;commit&gt; &lt;filename&gt;<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236  <\/p>\n<p>\u5176\u4e2d\uff0c  \u662f\u4f60\u9009\u62e9\u7684\u5386\u53f2\u7248\u672c\u53f7\uff0c  \u662f\u4f60\u9700\u8981\u8fd8\u539f\u7684\u6587\u4ef6\u540d\u3002  <\/p>\n<\/li>\n<\/ol>\n<h2>3. \u907f\u514d\u6587\u4ef6\u88ab\u8bef\u5220\u9664<\/h2>\n<p>\u5728\u4f7f\u7528Git\u65f6\u907f\u514d\u6587\u4ef6\u88ab\u8bef\u5220\u9664\u662f\u975e\u5e38\u91cd\u8981\u7684\uff0c\u4ee5\u4e0b\u662f\u4e00\u4e9b\u5e38\u7528\u7684\u65b9\u6cd5\uff1a<\/p>\n<h3>3.1. \u4f7f\u7528Git\u94a9\u5b50<\/h3>\n<p>\u4f7f\u7528Git\u94a9\u5b50\u53ef\u4ee5\u81ea\u52a8\u6267\u884c\u4e00\u4e9b\u64cd\u4f5c\uff0c\u5982\u5728\u63d0\u4ea4\u4ee3\u7801\u524d\u68c0\u67e5\u6587\u4ef6\u72b6\u6001\uff0c\u9632\u6b62\u8bef\u5220\u6587\u4ef6\u3002\u5177\u4f53\u53ef\u4ee5\u53c2\u8003[Git\u5b98\u65b9\u6587\u6863](https:\/\/git-scm.com\/book\/zh\/v2\/\u81ea\u5b9a\u4e49-Git-Git-\u94a9\u5b50)\u3002<\/p>\n<h3>3.2. \u4f7f\u7528Git\u522b\u540d<\/h3>\n<p>\u5728Git\u4e2d\u53ef\u4ee5\u914d\u7f6e\u522b\u540d\uff0c\u8fd9\u6837\u53ef\u4ee5\u907f\u514d\u4e00\u4e9b\u91cd\u590d\u7684\u547d\u4ee4\u3002\u6bd4\u5982\uff0c\u914d\u7f6e\u4ee5\u4e0b\u522b\u540d\u53ef\u4ee5\u907f\u514d\u8bef\u8fd0\u884c\u201cgit push &#8211;force\u201d\u547d\u4ee4\uff1a<\/p>\n<pre>git config --global alias.force-push 'push --force-with-lease'<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<h3>3.3. \u4f7f\u7528Git LFS<\/h3>\n<p>Git LFS\u662fGitHub\u5f00\u53d1\u7684\u5927\u6587\u4ef6\u7248\u672c\u63a7\u5236\u5de5\u5177\uff0c\u652f\u6301\u5bf9\u5927\u6587\u4ef6\u8fdb\u884c\u8ddf\u8e2a\u548c\u7ba1\u7406\u3002\u5728\u4f7f\u7528Git LFS\u65f6\uff0c\u5373\u4f7f\u662f\u5927\u6587\u4ef6\u4e5f\u53ef\u4ee5\u987a\u5229\u8fdb\u884c\u7248\u672c\u7ba1\u7406\uff0c\u540c\u65f6\u4e5f\u4e0d\u5bb9\u6613\u88ab\u8bef\u5220\u3002<\/p>\n<h2>4. \u603b\u7ed3<\/h2>\n<p>Git\u662f\u4e00\u4e2a\u5f3a\u5927\u7684\u7248\u672c\u63a7\u5236\u5de5\u5177\uff0c\u4f46\u662f\u5728\u4f7f\u7528\u5b83\u65f6\u4e5f\u6709\u4e00\u4e9b\u9700\u8981\u6ce8\u610f\u7684\u95ee\u9898\u3002\u672c\u6587\u4e3b\u8981\u9488\u5bf9\u4f7f\u7528\u201cgit pull\u201d\u547d\u4ee4\u5220\u9664\u6587\u4ef6\u8fd9\u4e2a\u95ee\u9898\u8fdb\u884c\u4e86\u8be6\u7ec6\u7684\u4ecb\u7ecd\uff0c\u5e76\u63d0\u4f9b\u4e86\u76f8\u5e94\u7684\u89e3\u51b3\u529e\u6cd5\u3002\u5e0c\u671b\u672c\u6587\u53ef\u4ee5\u5e2e\u52a9\u5927\u5bb6\u66f4\u597d\u5730\u4f7f\u7528Git\uff0c\u907f\u514d\u4e00\u4e9b\u4e0d\u5fc5\u8981\u7684\u9ebb\u70e6\u3002<\/p>\n<p>\u4ee5\u4e0a\u5c31\u662f\u5982\u4f55\u5904\u7406\u201cgit pull\u201d\u547d\u4ee4\u5220\u9664\u7684\u6587\u4ef6\u7684\u8be6\u7ec6\u5185\u5bb9\uff0c\u66f4\u591a\u8bf7\u5173\u6ce8\u7c73\u4e91\u5176\u5b83\u76f8\u5173\u6587\u7ae0\uff01<\/p>\n","protected":false},"excerpt":{"rendered":"<p>git\u662f\u4e00\u6b3e\u975e\u5e38\u5f3a\u5927\u7684\u7248\u672c\u63a7\u5236\u5de5\u5177\uff0c\u5b83\u8ba9\u56e2\u961f\u5f00\u53d1\u66f4\u52a0\u4fbf\u5229\u548c\u9ad8\u6548\u3002\u5728\u4f7f\u7528git\u65f6\uff0c\u7ecf\u5e38\u4f1a\u7528\u5230\u62c9\u53d6\u4ee3\u7801\u7684\u547d\u4ee4\u2014\u2014\u201cgit pull\u201d\u3002\u8fd9\u4e2a\u547d\u4ee4\u901a\u5e38\u7528\u4e8e\u66f4\u65b0\u4ee3\u7801\u3001\u83b7\u53d6\u6700\u65b0\u4ee3\u7801\u7b49\u573a\u666f\uff0c\u4f46\u662f\u4f60\u53ef\u80fd\u4f1a\u9047\u5230\u4e00\u4e2a\u95ee\u9898\uff1a\u5f53\u4f60\u4f7f\u7528\u201cgit pull\u201d\u547d\u4ee4\u62c9\u53d6\u4ee3\u7801\u65f6\uff0c\u53d1\u73b0\u67d0\u4e2a\u6587\u4ef6\u4e0d\u89c1\u4e86\u3002\u8fd9\u79cd\u60c5\u51b5\u4e0b\uff0c\u4f60\u5e94\u8be5\u600e\u4e48\u505a\u5462\uff1f\u672c\u6587\u5c06\u8be6\u7ec6\u4ecb\u7ecd\u5982\u4f55\u5904\u7406\u201cgit pull\u201d\u547d\u4ee4\u5220\u9664\u7684\u6587\u4ef6\u3002 1. \u5220\u9664\u7684\u60c5\u5f62 \u5728\u4f7f\u7528\u201cgit pull\u201d\u547d\u4ee4\u62c9\u53d6\u4ee3\u7801\u65f6\uff0c\u5982\u679c\u53d1\u73b0\u67d0\u4e2a\u6587\u4ef6\u5728\u672c\u5730\u51fa\u73b0\u5220\u9664\uff0c\u90a3\u4e48\u5f88\u6709\u53ef\u80fd\u662f\u56e0\u4e3a\u8be5\u6587\u4ef6\u5728\u8fdc\u7a0b\u4ee3\u7801\u5e93\u4e2d\u4e5f\u88ab\u5220\u9664\u4e86\u3002\u6b64\u65f6\uff0c\u4f60\u9700\u8981\u660e\u786e\u4ee5\u4e0b\u4e24\u4e2a\u95ee\u9898\uff1a \u8be5\u6587\u4ef6\u662f\u5426\u786e\u5b9e\u88ab\u5220\u9664\u4e86\uff1f \u5982\u679c\u786e\u5b9e\u88ab\u5220\u9664\u4e86\uff0c\u4f60\u662f\u5426\u771f\u7684\u9700\u8981\u8be5\u6587\u4ef6\uff1f \u5982\u679c\u4f60\u786e\u5b9a\u8be5\u6587\u4ef6\u4e0d\u5e94\u8be5\u88ab\u5220\u9664\uff0c\u90a3\u4e48\u4f60\u9700\u8981\u627e\u56de\u5b83\u3002 2. \u627e\u56de\u88ab\u5220\u9664\u7684\u6587\u4ef6 \u5728\u6267\u884c\u201cgit pull\u201d\u547d\u4ee4\u540e\uff0c\u5982\u679c\u53d1\u73b0\u67d0\u4e2a\u6587\u4ef6\u88ab\u5220\u9664\u4e86\uff0c\u90a3\u4e48\u53ef\u4ee5\u901a\u8fc7\u4ee5\u4e0b\u64cd\u4f5c\u627e\u56de\u8be5\u6587\u4ef6\uff1a 2.1 \u6062\u590d\u6587\u4ef6\u5230\u6700\u65b0\u7248\u672c \u5728\u4f7f\u7528\u201cgit pull\u201d\u547d\u4ee4\u62c9\u53d6\u4ee3\u7801\u65f6\uff0c\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u5f3a\u5236\u8986\u76d6\u672c\u5730\u5185\u5bb9\uff1a git fetch &#8211;all git reset &#8211;hard origin\/master \u767b\u5f55\u540e\u590d\u5236 \u8fd9\u4e24\u884c\u547d\u4ee4\u53ef\u4ee5\u5f3a\u5236\u5c06\u672c\u5730\u7684\u6587\u4ef6\u8986\u76d6\u4e3a\u8fdc\u7a0b\u4ee3\u7801\u5e93\u7684\u6700\u65b0\u7248\u672c\u3002\u4f46\u662f\u9700\u8981\u6ce8\u610f\u7684\u662f\uff0c\u8fd9\u6837\u4f1a\u5bfc\u81f4\u672c\u5730\u672a\u63d0\u4ea4\u7684\u4ee3\u7801\u4e22\u5931\uff0c\u8bf7\u5728\u64cd\u4f5c\u524d\u5907\u4efd\u597d\u672c\u5730\u7684\u4ee3\u7801\u3002 2.2 \u4ece\u5386\u53f2\u7248\u672c\u4e2d\u627e\u56de\u6587\u4ef6 \u5982\u679c\u4f60\u5df2\u7ecf\u63d0\u4ea4\u4e86\u8be5\u6587\u4ef6\uff0c\u5e76\u4e14\u5728\u8fdc\u7a0b\u4ee3\u7801\u5e93\u4e2d\u4e5f\u88ab\u5220\u9664\u4e86\uff0c\u90a3\u4e48\u53ef\u4ee5\u6309\u7167\u4ee5\u4e0b\u6b65\u9aa4\u627e\u56de\u8be5\u6587\u4ef6\uff1a \u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u67e5\u770b\u8be5\u6587\u4ef6\u7684\u5386\u53f2\u7248\u672c\uff1a git log &#8212; &lt;filename&gt; \u767b\u5f55\u540e\u590d\u5236 \u9009\u62e9\u4f60\u9700\u8981\u8fd8\u539f\u7684\u5386\u53f2\u7248\u672c\uff0c\u5e76\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u8fd8\u539f\u7248\u672c\uff1a git checkout &lt;commit&gt; &lt;filename&gt; \u767b\u5f55\u540e\u590d\u5236 \u5176\u4e2d\uff0c \u662f\u4f60\u9009\u62e9\u7684\u5386\u53f2\u7248\u672c\u53f7\uff0c \u662f\u4f60\u9700\u8981\u8fd8\u539f\u7684\u6587\u4ef6\u540d\u3002 3. \u907f\u514d\u6587\u4ef6\u88ab\u8bef\u5220\u9664 \u5728\u4f7f\u7528Git\u65f6\u907f\u514d\u6587\u4ef6\u88ab\u8bef\u5220\u9664\u662f\u975e\u5e38\u91cd\u8981\u7684\uff0c\u4ee5\u4e0b\u662f\u4e00\u4e9b\u5e38\u7528\u7684\u65b9\u6cd5\uff1a 3.1. \u4f7f\u7528Git\u94a9\u5b50 \u4f7f\u7528Git\u94a9\u5b50\u53ef\u4ee5\u81ea\u52a8\u6267\u884c\u4e00\u4e9b\u64cd\u4f5c\uff0c\u5982\u5728\u63d0\u4ea4\u4ee3\u7801\u524d\u68c0\u67e5\u6587\u4ef6\u72b6\u6001\uff0c\u9632\u6b62\u8bef\u5220\u6587\u4ef6\u3002\u5177\u4f53\u53ef\u4ee5\u53c2\u8003[Git\u5b98\u65b9\u6587\u6863](https:\/\/git-scm.com\/book\/zh\/v2\/\u81ea\u5b9a\u4e49-Git-Git-\u94a9\u5b50)\u3002 3.2. \u4f7f\u7528Git\u522b\u540d \u5728Git\u4e2d\u53ef\u4ee5\u914d\u7f6e\u522b\u540d\uff0c\u8fd9\u6837\u53ef\u4ee5\u907f\u514d\u4e00\u4e9b\u91cd\u590d\u7684\u547d\u4ee4\u3002\u6bd4\u5982\uff0c\u914d\u7f6e\u4ee5\u4e0b\u522b\u540d\u53ef\u4ee5\u907f\u514d\u8bef\u8fd0\u884c\u201cgit [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[16],"tags":[],"class_list":["post-19136","post","type-post","status-publish","format-standard","hentry","category-16"],"_links":{"self":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/19136","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/comments?post=19136"}],"version-history":[{"count":0,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/19136\/revisions"}],"wp:attachment":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/media?parent=19136"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/categories?post=19136"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/tags?post=19136"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}