{"id":20240,"date":"2024-11-19T12:43:31","date_gmt":"2024-11-19T04:43:31","guid":{"rendered":"https:\/\/fwq.ai\/blog\/20240\/"},"modified":"2024-11-19T12:43:31","modified_gmt":"2024-11-19T04:43:31","slug":"git%e6%80%8e%e4%b9%88%e5%9b%9e%e9%80%80pull%e6%93%8d%e4%bd%9c","status":"publish","type":"post","link":"https:\/\/fwq.ai\/blog\/20240\/","title":{"rendered":"git\u600e\u4e48\u56de\u9000pull\u64cd\u4f5c"},"content":{"rendered":"

\u968f\u7740 git \u7684\u5e7f\u6cdb\u5e94\u7528\uff0c\u6709\u8bb8\u591a\u5f00\u53d1\u4eba\u5458\u9047\u5230\u4e86\u610f\u5916\u7684\u5408\u5e76\uff0c\u7279\u522b\u662f\u5728\u62c9\u53d6(pull)\u64cd\u4f5c\u65f6\u3002\u9047\u5230\u8fd9\u79cd\u60c5\u51b5\uff0c\u4e00\u4e2a\u7b80\u5355\u7684\u89e3\u51b3\u65b9\u6848\u662f\u56de\u5f52\u5230\u539f\u59cb\u72b6\u6001\uff0c\u7136\u540e\u91cd\u65b0\u5f00\u59cb\u4e00\u4e2a\u65b0\u7684\u5206\u652f\uff0c\u8fd9\u6837\u5c31\u53ef\u4ee5\u907f\u514d\u9519\u8bef\u7684\u5408\u5e76\u5bf9\u9879\u76ee\u9020\u6210\u5f71\u54cd\u3002\u5728\u672c\u7bc7\u6587\u7ae0\u4e2d\uff0c\u6211\u4eec\u5c06\u5411\u60a8\u4ecb\u7ecd\u5982\u4f55\u56de\u9000 pull \u64cd\u4f5c\u3002<\/p>\n

\u4ec0\u4e48\u662f pull \u64cd\u4f5c<\/h3>\n

\u9996\u5148\uff0c\u6211\u4eec\u9700\u8981\u6f84\u6e05\u4e00\u4e0b pull \u64cd\u4f5c\u7684\u6982\u5ff5\u3002Pull \u8868\u793a\u4ece\u8fdc\u7a0b\u4ed3\u5e93\u83b7\u53d6\u6700\u65b0\u7248\u672c\uff0c\u5e76\u5c06\u5176\u5408\u5e76\u5230\u672c\u5730\u5206\u652f\u3002\u4e00\u822c\u60c5\u51b5\u4e0b\uff0c\u6211\u4eec\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u8fdb\u884c\u62c9\u53d6\uff1a<\/p>\n

git pull origin master<\/pre>\n
  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
\u4ee5\u4e0a\u547d\u4ee4\u610f\u5473\u7740\u4ece\u8fdc\u7a0b\u4ed3\u5e93 origin \u7684 master \u5206\u652f\u83b7\u53d6\u6700\u65b0\u7248\u672c\u5e76\u5c06\u5176\u5408\u5e76\u5230\u672c\u5730 master \u5206\u652f\u3002\u5982\u679c\u6b64\u65f6\u672c\u5730\u5206\u652f\u6709\u672a\u63d0\u4ea4\u7684\u66f4\u6539\uff0c\u5219\u5fc5\u987b\u5148\u63d0\u4ea4\u66f4\u6539\u3001\u89e3\u51b3\u51b2\u7a81\uff0c\u624d\u80fd\u8fdb\u884c pull \u64cd\u4f5c\u3002<\/p>\n
\u5feb\u901f\u56de\u9000 pull \u64cd\u4f5c<\/h3>\n
\u5982\u679c\u60a8\u4ec5\u9700\u8981\u56de\u9000\u5230\u6700\u65b0\u7684\u63d0\u4ea4\uff0c\u53ef\u4ee5\u4f7f\u7528 git reset \u547d\u4ee4\uff0c\u5982\u4e0b\u6240\u793a\uff1a<\/p>\n
git reset --hard HEAD^<\/pre>\n
  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
\u4ee5\u4e0a\u547d\u4ee4\u5c06\u91cd\u8bbe(\u56de\u9000)\u6700\u8fd1\u7684\u4e00\u6b21\u63d0\u4ea4\u3002\u6211\u4eec\u5fc5\u987b\u4f7f\u7528 –hard \u53c2\u6570\u6765\u8986\u76d6\u672c\u5730\u66f4\u6539\uff0c\u56e0\u6b64\u8bf7\u786e\u4fdd\u60a8\u5df2\u7ecf\u5907\u4efd\u4e86\u60a8\u7684\u66f4\u6539\u3002<\/p>\n
\u5982\u679c\u60a8\u60f3\u8981\u56de\u9000\u5230\u591a\u6b21\u63d0\u4ea4\u4e2d\u7684\u4efb\u610f\u4e00\u6b21\u63d0\u4ea4\uff0c\u53ef\u4ee5\u4f7f\u7528 commit ID \u4f5c\u4e3a\u53c2\u6570\u3002\u4f8b\u5982\uff0c\u4ee5\u4e0b\u547d\u4ee4\u5c06\u56de\u9000\u5230\u63d0\u4ea4ID\u4e3a 123456 \u7684\u63d0\u4ea4\uff1a<\/p>\n
git reset --hard 123456<\/pre>\n
  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
\u8bf7\u6ce8\u610f\uff0c\u8fd9\u4e2a\u547d\u4ee4\u4f1a\u8986\u76d6\u6240\u6709\u5148\u524d\u7684\u66f4\u6539\uff0c\u8bf7\u8c28\u614e\u64cd\u4f5c\u3002<\/p>\n
\u56de\u9000\u8fdc\u7a0b\u5206\u652f<\/h3>\n
\u5f53\u6211\u4eec\u8fdb\u884c\u4e86\u9519\u8bef\u7684\u5408\u5e76\u65f6\uff0c\u6211\u4eec\u53ef\u80fd\u9700\u8981\u56de\u9000\u5230\u8fdc\u7a0b\u5206\u652f\u3002\u5728\u8fd9\u79cd\u60c5\u51b5\u4e0b\uff0c\u4e00\u65e6\u91cd\u7f6e\uff0c\u6211\u4eec\u5c06\u5931\u53bb\u4e4b\u524d\u5408\u5e76\u7684\u6240\u6709\u66f4\u6539\u3002\u4e3a\u4e86\u56de\u9000\u5230\u8fdc\u7a0b\u5206\u652f\uff0c\u6211\u4eec\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\uff1a<\/p>\n
git reset --hard origin\/master<\/pre>\n
  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
\u4ee5\u4e0a\u4ee3\u7801\u5c06\u91cd\u7f6e\u672c\u5730\u5206\u652f\u4e3a\u8fdc\u7a0b\u4ed3\u5e93\u7684 master \u5206\u652f\u3002\u8bf7\u6ce8\u610f\uff0c\u8fd9\u4e2a\u547d\u4ee4\u540c\u6837\u4f1a\u8986\u76d6\u6240\u6709\u5148\u524d\u7684\u66f4\u6539\uff0c\u8bf7\u8c28\u614e\u64cd\u4f5c\u3002<\/p>\n
\u62d2\u7edd\u5408\u5e76(commit rejection)<\/h3>\n
\u6709\u65f6\uff0c\u5728\u8fdb\u884c\u5408\u5e76\u64cd\u4f5c\u540e\uff0c\u6211\u4eec\u53ef\u80fd\u9700\u8981\u62d2\u7edd\u5408\u5e76\uff0c\u7136\u540e\u7ee7\u7eed\u8fdb\u884c\u5176\u4ed6\u64cd\u4f5c\u3002\u5728\u8fd9\u79cd\u60c5\u51b5\u4e0b\uff0c\u6211\u4eec\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\uff1a<\/p>\n
git revert -m 1 <commit-hash><\/commit-hash><\/pre>\n
  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
\u8fd9\u4e2a\u547d\u4ee4\u4f1a\u64a4\u9500\u4ee5\u524d\u7684\u63d0\u4ea4\u3002\u5982\u679c\u6709\u4e24\u4e2a\u6216\u66f4\u591a\u7236\u7ea7\u5408\u5e76\u63d0\u4ea4\uff0c\u5219\u5fc5\u987b\u4f7f\u7528 -m 1 \u53c2\u6570\u6765\u6307\u5b9a\u4e3b\u8981\u63d0\u4ea4\u3002\u6709\u65f6\uff0c\u6211\u4eec\u9700\u8981\u5408\u5e76\u591a\u4e2a\u63d0\u4ea4\uff0c\u8fd9\u4e2a\u547d\u4ee4\u975e\u5e38\u5b9e\u7528\u3002<\/p>\n
\u4fdd\u7559\u67d0\u4e9b\u66f4\u6539<\/h3>\n
\u5728\u56de\u9000\u4e4b\u524d\uff0c\u6709\u65f6\u6211\u4eec\u9700\u8981\u4fdd\u7559\u67d0\u4e9b\u66f4\u6539\u3002\u5728\u8fd9\u79cd\u60c5\u51b5\u4e0b\uff0c\u6211\u4eec\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\uff1a<\/p>\n
git stash<\/pre>\n
  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
\u4ee5\u4e0a\u547d\u4ee4\u5c06\u5f53\u524d\u5de5\u4f5c\u76ee\u5f55\u548c\u7d22\u5f15\u72b6\u6001\u5b58\u50a8\u5728\u5806\u6808\u4e2d\uff0c\u5e76\u5c06\u5f53\u524d\u72b6\u6001\u6e05\u9664\u3002\u8fd9\u610f\u5473\u7740\uff0c\u6211\u4eec\u53ef\u4ee5\u5b89\u5168\u5730\u8fdb\u884c\u91cd\u7f6e\/\u56de\u9000\u64cd\u4f5c\uff0c\u800c\u4e0d\u83b7\u5f97\u4e0e\u5176\u4ed6\u66f4\u6539\u51b2\u7a81\u7684\u5f71\u54cd\u3002\u83b7\u53d6\u66f4\u6539\u540e\uff0c\u6211\u4eec\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u6062\u590d\u5b83\u4eec\uff1a<\/p>\n
git stash apply<\/pre>\n
  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
\u8fd9\u4f1a\u5c06\u4fdd\u5b58\u7684\u66f4\u6539\u8fd8\u539f\u4e3a\u5de5\u4f5c\u76ee\u5f55\uff0c\u5e76\u5c06\u7ed3\u679c\u5408\u5e76\u5230\u7d22\u5f15\u4e2d\u3002<\/p>\n
\u603b\u7ed3<\/h3>\n
\u5982\u4e0a\u6240\u8ff0\uff0c\u56de\u9000 pull \u64cd\u4f5c\u6709\u8bb8\u591a\u65b9\u6cd5\uff0c\u6bcf\u4e2a\u65b9\u6cd5\u90fd\u4e0d\u540c\uff0c\u5e76\u4e14\u53ef\u80fd\u9700\u8981\u4e0d\u540c\u7684\u6b65\u9aa4\u3002\u5728\u56de\u9000\u4e4b\u524d\uff0c\u8bf7\u786e\u4fdd\u60a8\u5df2\u5907\u4efd\u6240\u6709\u66f4\u6539\uff0c\u5e76\u4e14\u5df2\u786e\u8ba4\u60a8\u7684\u56de\u9000\u65b9\u6cd5\u3002\u5982\u679c\u60a8\u4e0d\u786e\u5b9a\uff0c\u8bf7\u5907\u4efd\u6240\u6709\u66f4\u6539\uff0c\u5e76\u5728\u64cd\u4f5c\u524d\u54a8\u8be2\u60a8\u7684\u56e2\u961f\u6210\u5458\u6216\u66f4\u6709\u7ecf\u9a8c\u7684\u540c\u4e8b\u3002<\/p>\n
\u4ee5\u4e0a\u5c31\u662fgit\u600e\u4e48\u56de\u9000pull\u64cd\u4f5c\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":"
\u968f\u7740 git \u7684\u5e7f\u6cdb\u5e94\u7528\uff0c\u6709\u8bb8\u591a\u5f00\u53d1\u4eba\u5458\u9047\u5230\u4e86\u610f\u5916\u7684\u5408\u5e76\uff0c\u7279\u522b\u662f\u5728\u62c9\u53d6(pull)\u64cd\u4f5c\u65f6\u3002\u9047\u5230\u8fd9\u79cd\u60c5\u51b5\uff0c\u4e00\u4e2a\u7b80\u5355\u7684\u89e3\u51b3\u65b9\u6848\u662f\u56de\u5f52\u5230\u539f\u59cb\u72b6\u6001\uff0c\u7136\u540e\u91cd\u65b0\u5f00\u59cb\u4e00\u4e2a\u65b0\u7684\u5206\u652f\uff0c\u8fd9\u6837\u5c31\u53ef\u4ee5\u907f\u514d\u9519\u8bef\u7684\u5408\u5e76\u5bf9\u9879\u76ee\u9020\u6210\u5f71\u54cd\u3002\u5728\u672c\u7bc7\u6587\u7ae0\u4e2d\uff0c\u6211\u4eec\u5c06\u5411\u60a8\u4ecb\u7ecd\u5982\u4f55\u56de\u9000 pull \u64cd\u4f5c\u3002 \u4ec0\u4e48\u662f pull \u64cd\u4f5c \u9996\u5148\uff0c\u6211\u4eec\u9700\u8981\u6f84\u6e05\u4e00\u4e0b pull \u64cd\u4f5c\u7684\u6982\u5ff5\u3002Pull \u8868\u793a\u4ece\u8fdc\u7a0b\u4ed3\u5e93\u83b7\u53d6\u6700\u65b0\u7248\u672c\uff0c\u5e76\u5c06\u5176\u5408\u5e76\u5230\u672c\u5730\u5206\u652f\u3002\u4e00\u822c\u60c5\u51b5\u4e0b\uff0c\u6211\u4eec\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u8fdb\u884c\u62c9\u53d6\uff1a git pull origin master \u767b\u5f55\u540e\u590d\u5236 \u4ee5\u4e0a\u547d\u4ee4\u610f\u5473\u7740\u4ece\u8fdc\u7a0b\u4ed3\u5e93 origin \u7684 master \u5206\u652f\u83b7\u53d6\u6700\u65b0\u7248\u672c\u5e76\u5c06\u5176\u5408\u5e76\u5230\u672c\u5730 master \u5206\u652f\u3002\u5982\u679c\u6b64\u65f6\u672c\u5730\u5206\u652f\u6709\u672a\u63d0\u4ea4\u7684\u66f4\u6539\uff0c\u5219\u5fc5\u987b\u5148\u63d0\u4ea4\u66f4\u6539\u3001\u89e3\u51b3\u51b2\u7a81\uff0c\u624d\u80fd\u8fdb\u884c pull \u64cd\u4f5c\u3002 \u5feb\u901f\u56de\u9000 pull \u64cd\u4f5c \u5982\u679c\u60a8\u4ec5\u9700\u8981\u56de\u9000\u5230\u6700\u65b0\u7684\u63d0\u4ea4\uff0c\u53ef\u4ee5\u4f7f\u7528 git reset \u547d\u4ee4\uff0c\u5982\u4e0b\u6240\u793a\uff1a git reset –hard HEAD^ \u767b\u5f55\u540e\u590d\u5236 \u4ee5\u4e0a\u547d\u4ee4\u5c06\u91cd\u8bbe(\u56de\u9000)\u6700\u8fd1\u7684\u4e00\u6b21\u63d0\u4ea4\u3002\u6211\u4eec\u5fc5\u987b\u4f7f\u7528 –hard \u53c2\u6570\u6765\u8986\u76d6\u672c\u5730\u66f4\u6539\uff0c\u56e0\u6b64\u8bf7\u786e\u4fdd\u60a8\u5df2\u7ecf\u5907\u4efd\u4e86\u60a8\u7684\u66f4\u6539\u3002 \u5982\u679c\u60a8\u60f3\u8981\u56de\u9000\u5230\u591a\u6b21\u63d0\u4ea4\u4e2d\u7684\u4efb\u610f\u4e00\u6b21\u63d0\u4ea4\uff0c\u53ef\u4ee5\u4f7f\u7528 commit ID \u4f5c\u4e3a\u53c2\u6570\u3002\u4f8b\u5982\uff0c\u4ee5\u4e0b\u547d\u4ee4\u5c06\u56de\u9000\u5230\u63d0\u4ea4ID\u4e3a 123456 \u7684\u63d0\u4ea4\uff1a git reset –hard 123456 \u767b\u5f55\u540e\u590d\u5236 \u8bf7\u6ce8\u610f\uff0c\u8fd9\u4e2a\u547d\u4ee4\u4f1a\u8986\u76d6\u6240\u6709\u5148\u524d\u7684\u66f4\u6539\uff0c\u8bf7\u8c28\u614e\u64cd\u4f5c\u3002 \u56de\u9000\u8fdc\u7a0b\u5206\u652f \u5f53\u6211\u4eec\u8fdb\u884c\u4e86\u9519\u8bef\u7684\u5408\u5e76\u65f6\uff0c\u6211\u4eec\u53ef\u80fd\u9700\u8981\u56de\u9000\u5230\u8fdc\u7a0b\u5206\u652f\u3002\u5728\u8fd9\u79cd\u60c5\u51b5\u4e0b\uff0c\u4e00\u65e6\u91cd\u7f6e\uff0c\u6211\u4eec\u5c06\u5931\u53bb\u4e4b\u524d\u5408\u5e76\u7684\u6240\u6709\u66f4\u6539\u3002\u4e3a\u4e86\u56de\u9000\u5230\u8fdc\u7a0b\u5206\u652f\uff0c\u6211\u4eec\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\uff1a […]<\/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-20240","post","type-post","status-publish","format-standard","hentry","category-16"],"_links":{"self":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/20240","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=20240"}],"version-history":[{"count":0,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/20240\/revisions"}],"wp:attachment":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/media?parent=20240"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/categories?post=20240"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/tags?post=20240"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}