{"id":19149,"date":"2024-11-19T16:08:01","date_gmt":"2024-11-19T08:08:01","guid":{"rendered":"https:\/\/fwq.ai\/blog\/19149\/"},"modified":"2024-11-19T16:08:01","modified_gmt":"2024-11-19T08:08:01","slug":"%e5%a6%82%e4%bd%95%e5%9c%a8-git-pull-%e6%97%b6%e4%bf%9d%e7%95%99%e6%9c%ac%e5%9c%b0%e4%bf%ae%e6%94%b9","status":"publish","type":"post","link":"https:\/\/fwq.ai\/blog\/19149\/","title":{"rendered":"\u5982\u4f55\u5728 Git Pull \u65f6\u4fdd\u7559\u672c\u5730\u4fee\u6539"},"content":{"rendered":"<p>\u5728\u5f00\u53d1\u8fc7\u7a0b\u4e2d\uff0c\u6211\u4eec\u7ecf\u5e38\u9700\u8981\u4ece\u8fdc\u7a0b\u4ed3\u5e93\u62c9\u53d6\u4ee3\u7801\u66f4\u65b0\u3002\u800c git pull \u547d\u4ee4\u5c31\u662f\u7528\u4e8e\u4ece\u8fdc\u7a0b\u4ed3\u5e93\u62c9\u53d6\u4ee3\u7801\u66f4\u65b0\u5e76\u81ea\u52a8\u5408\u5e76\u5230\u672c\u5730\u4ed3\u5e93\u7684\u547d\u4ee4\u3002\u4f46\u662f\uff0c\u6709\u65f6\u5019\u6211\u4eec\u5728\u672c\u5730\u5bf9\u4ee3\u7801\u8fdb\u884c\u4e86\u4fee\u6539\uff0c\u6b64\u65f6\u6267\u884c git pull \u64cd\u4f5c\u4f1a\u8986\u76d6\u672c\u5730\u4fee\u6539\uff0c\u9020\u6210\u4ee3\u7801\u4e22\u5931\u7684\u98ce\u9669\u3002\u56e0\u6b64\uff0c\u672c\u6587\u5c06\u4ecb\u7ecd\u5982\u4f55\u5728 git pull \u65f6\u4fdd\u7559\u672c\u5730\u4fee\u6539\uff0c\u907f\u514d\u4ee3\u7801\u4e22\u5931\u7684\u60c5\u51b5\u3002<\/p>\n<ol>\n<li>\u4f7f\u7528 Git Stash \u4fdd\u5b58\u672c\u5730\u4fee\u6539<\/li>\n<\/ol>\n<p>Git Stash \u662f\u4e00\u4e2a\u975e\u5e38\u6709\u7528\u7684\u547d\u4ee4\uff0c\u5b83\u53ef\u4ee5\u5c06\u5f53\u524d\u5de5\u4f5c\u76ee\u5f55\u4e2d\u7684\u6240\u6709\u672a\u63d0\u4ea4\u7684\u4fee\u6539\u5b58\u50a8\u5728\u4e00\u4e2a\u6808\u4e2d\uff0c\u5e76\u5c06\u5de5\u4f5c\u76ee\u5f55\u6062\u590d\u5230 Git Pull \u547d\u4ee4\u6267\u884c\u524d\u7684\u72b6\u6001\u3002\u5f53\u6211\u4eec\u6267\u884c Git Pull \u547d\u4ee4\u540e\uff0c\u518d\u4f7f\u7528 Git Stash Pop \u547d\u4ee4\u5373\u53ef\u5c06\u4e4b\u524d\u4fdd\u5b58\u7684\u4fee\u6539\u5e94\u7528\u5230\u5f53\u524d\u5de5\u4f5c\u76ee\u5f55\uff0c\u4ece\u800c\u4fdd\u7559\u4e86\u672c\u5730\u4fee\u6539\u3002<\/p>\n<p>\u4e0b\u9762\u662f\u4e00\u4e2a\u793a\u4f8b\uff0c\u6f14\u793a\u5982\u4f55\u4f7f\u7528 Git Stash \u4fdd\u5b58\u672c\u5730\u4fee\u6539\uff1a<\/p>\n<p>$ git stash save &#8220;save my local changes&#8221;<br \/>$ git pull<br \/>$ git stash pop<\/p>\n<ol>\n<li>\u4f7f\u7528 Git Commit \u4fdd\u5b58\u672c\u5730\u4fee\u6539<\/li>\n<\/ol>\n<p>Git Commit \u662f\u5c06 Git \u4ed3\u5e93\u4e2d\u7684\u4fee\u6539\u8bb0\u5f55\u5230\u5386\u53f2\u8bb0\u5f55\u4e2d\u7684\u547d\u4ee4\u3002\u5982\u679c\u6211\u4eec\u5df2\u7ecf\u5bf9\u4ee3\u7801\u8fdb\u884c\u4e86\u4fee\u6539\uff0c\u53ef\u4ee5\u901a\u8fc7 Git Commit \u63d0\u4ea4\u66f4\u6539\uff0c\u4ece\u800c\u5728\u6267\u884c Git Pull \u547d\u4ee4\u65f6\u4fdd\u7559\u672c\u5730\u4fee\u6539\u3002\u8fd9\u79cd\u65b9\u6cd5\u9700\u8981\u5c06\u4fee\u6539\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\uff0c\u56e0\u6b64\u9700\u8981\u5c06\u66f4\u6539\u8bf7\u6c42\u5408\u5e76\u5230\u4e3b\u5206\u652f\u540e\u518d\u6267\u884c Git Pull\u3002<\/p>\n<p>\u4e0b\u9762\u662f\u4e00\u4e2a\u793a\u4f8b\uff0c\u6f14\u793a\u5982\u4f55\u4f7f\u7528 Git Commit \u4fdd\u5b58\u672c\u5730\u4fee\u6539\uff1a<\/p>\n<p>$ git add .<br \/>$ git commit -m &#8220;save my local changes&#8221;<br \/>$ git pull<\/p>\n<ol>\n<li>\u4f7f\u7528 Git Patch \u4fdd\u5b58\u672c\u5730\u4fee\u6539<\/li>\n<\/ol>\n<p>Git Patch \u662f\u4e00\u79cd\u53ef\u4ee5\u5c06\u672c\u5730\u4fee\u6539\u6253\u5305\u6210\u4e00\u4e2a\u8865\u4e01\u6587\u4ef6\uff0c\u5e76\u5c06\u5176\u5e94\u7528\u5230\u5176\u4ed6 Git \u4ed3\u5e93\u7684\u547d\u4ee4\u3002\u5982\u679c\u6211\u4eec\u5728\u672c\u5730\u4fee\u6539\u4e86\u6587\u4ef6\u4f46\u4e0d\u60f3\u8fdb\u884c Git Commit \u6216\u8005 Git Stash\uff0c\u53ef\u4ee5\u4f7f\u7528 Git Patch \u4fdd\u5b58\u672c\u5730\u4fee\u6539\uff0c\u5e76\u5728\u6267\u884c Git Pull \u547d\u4ee4\u65f6\u5e94\u7528\u8be5\u8865\u4e01\u6587\u4ef6\u3002\u8be5\u65b9\u6cd5\u7684\u597d\u5904\u5728\u4e8e\uff0c\u5b83\u53ef\u4ee5\u4ec5\u4ec5\u63d0\u4ea4\u4fee\u6539\u7684\u90e8\u5206\uff0c\u907f\u514d\u975e\u5fc5\u8981\u7684\u63d0\u4ea4\u3002<\/p>\n<p>\u4e0b\u9762\u662f\u4e00\u4e2a\u793a\u4f8b\uff0c\u6f14\u793a\u5982\u4f55\u4f7f\u7528 Git Patch \u4fdd\u5b58\u672c\u5730\u4fee\u6539\uff1a<\/p>\n<p>$ git diff &gt; my.patch<br \/>$ git pull<br \/>$ git apply my.patch<\/p>\n<p>\u603b\u7ed3\uff1a<\/p>\n<p>\u4ee5\u4e0a\u5c31\u662f\u4fdd\u7559\u672c\u5730\u4fee\u6539\u7684\u4e09\u79cd\u65b9\u6cd5\uff1a\u4f7f\u7528 Git Stash\u3001\u4f7f\u7528 Git Commit \u548c\u4f7f\u7528 Git Patch\u3002\u65e0\u8bba\u4f7f\u7528\u54ea\u4e00\u79cd\u65b9\u6cd5\uff0c\u90fd\u80fd\u591f\u4fdd\u7559\u672c\u5730\u4fee\u6539\uff0c\u907f\u514d\u4ee3\u7801\u4e22\u5931\u7684\u98ce\u9669\u3002\u5728\u5b9e\u9645\u5f00\u53d1\u4e2d\uff0c\u5efa\u8bae\u6839\u636e\u5b9e\u9645\u60c5\u51b5\u9009\u62e9\u5408\u9002\u7684\u65b9\u6cd5\u3002<\/p>\n<p>\u4ee5\u4e0a\u5c31\u662f\u5982\u4f55\u5728 Git Pull \u65f6\u4fdd\u7559\u672c\u5730\u4fee\u6539\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>\u5728\u5f00\u53d1\u8fc7\u7a0b\u4e2d\uff0c\u6211\u4eec\u7ecf\u5e38\u9700\u8981\u4ece\u8fdc\u7a0b\u4ed3\u5e93\u62c9\u53d6\u4ee3\u7801\u66f4\u65b0\u3002\u800c git pull \u547d\u4ee4\u5c31\u662f\u7528\u4e8e\u4ece\u8fdc\u7a0b\u4ed3\u5e93\u62c9\u53d6\u4ee3\u7801\u66f4\u65b0\u5e76\u81ea\u52a8\u5408\u5e76\u5230\u672c\u5730\u4ed3\u5e93\u7684\u547d\u4ee4\u3002\u4f46\u662f\uff0c\u6709\u65f6\u5019\u6211\u4eec\u5728\u672c\u5730\u5bf9\u4ee3\u7801\u8fdb\u884c\u4e86\u4fee\u6539\uff0c\u6b64\u65f6\u6267\u884c git pull \u64cd\u4f5c\u4f1a\u8986\u76d6\u672c\u5730\u4fee\u6539\uff0c\u9020\u6210\u4ee3\u7801\u4e22\u5931\u7684\u98ce\u9669\u3002\u56e0\u6b64\uff0c\u672c\u6587\u5c06\u4ecb\u7ecd\u5982\u4f55\u5728 git pull \u65f6\u4fdd\u7559\u672c\u5730\u4fee\u6539\uff0c\u907f\u514d\u4ee3\u7801\u4e22\u5931\u7684\u60c5\u51b5\u3002 \u4f7f\u7528 Git Stash \u4fdd\u5b58\u672c\u5730\u4fee\u6539 Git Stash \u662f\u4e00\u4e2a\u975e\u5e38\u6709\u7528\u7684\u547d\u4ee4\uff0c\u5b83\u53ef\u4ee5\u5c06\u5f53\u524d\u5de5\u4f5c\u76ee\u5f55\u4e2d\u7684\u6240\u6709\u672a\u63d0\u4ea4\u7684\u4fee\u6539\u5b58\u50a8\u5728\u4e00\u4e2a\u6808\u4e2d\uff0c\u5e76\u5c06\u5de5\u4f5c\u76ee\u5f55\u6062\u590d\u5230 Git Pull \u547d\u4ee4\u6267\u884c\u524d\u7684\u72b6\u6001\u3002\u5f53\u6211\u4eec\u6267\u884c Git Pull \u547d\u4ee4\u540e\uff0c\u518d\u4f7f\u7528 Git Stash Pop \u547d\u4ee4\u5373\u53ef\u5c06\u4e4b\u524d\u4fdd\u5b58\u7684\u4fee\u6539\u5e94\u7528\u5230\u5f53\u524d\u5de5\u4f5c\u76ee\u5f55\uff0c\u4ece\u800c\u4fdd\u7559\u4e86\u672c\u5730\u4fee\u6539\u3002 \u4e0b\u9762\u662f\u4e00\u4e2a\u793a\u4f8b\uff0c\u6f14\u793a\u5982\u4f55\u4f7f\u7528 Git Stash \u4fdd\u5b58\u672c\u5730\u4fee\u6539\uff1a $ git stash save &#8220;save my local changes&#8221;$ git pull$ git stash pop \u4f7f\u7528 Git Commit \u4fdd\u5b58\u672c\u5730\u4fee\u6539 Git Commit \u662f\u5c06 Git \u4ed3\u5e93\u4e2d\u7684\u4fee\u6539\u8bb0\u5f55\u5230\u5386\u53f2\u8bb0\u5f55\u4e2d\u7684\u547d\u4ee4\u3002\u5982\u679c\u6211\u4eec\u5df2\u7ecf\u5bf9\u4ee3\u7801\u8fdb\u884c\u4e86\u4fee\u6539\uff0c\u53ef\u4ee5\u901a\u8fc7 Git Commit [&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-19149","post","type-post","status-publish","format-standard","hentry","category-16"],"_links":{"self":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/19149","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=19149"}],"version-history":[{"count":0,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/19149\/revisions"}],"wp:attachment":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/media?parent=19149"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/categories?post=19149"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/tags?post=19149"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}