{"id":19338,"date":"2024-11-19T15:21:45","date_gmt":"2024-11-19T07:21:45","guid":{"rendered":"https:\/\/fwq.ai\/blog\/19338\/"},"modified":"2024-11-19T15:21:45","modified_gmt":"2024-11-19T07:21:45","slug":"%e5%a6%82%e4%bd%95%e6%ad%a3%e7%a1%ae%e5%9c%b0%e6%9b%b4%e6%96%b0-git-%e4%bb%93%e5%ba%93","status":"publish","type":"post","link":"https:\/\/fwq.ai\/blog\/19338\/","title":{"rendered":"\u5982\u4f55\u6b63\u786e\u5730\u66f4\u65b0 Git \u4ed3\u5e93"},"content":{"rendered":"

\u5728\u4f7f\u7528 git \u8fdb\u884c\u534f\u4f5c\u5f00\u53d1\u7684\u8fc7\u7a0b\u4e2d\uff0c\u4f60\u53ef\u80fd\u9700\u8981\u5c06\u672c\u5730\u4ed3\u5e93\u540c\u6b65\u66f4\u65b0\u5230\u8fdc\u7a0b\u4ed3\u5e93\u4e0a\u6216\u8005\u4ece\u8fdc\u7a0b\u4ed3\u5e93\u4e2d\u83b7\u53d6\u6700\u65b0\u7684\u4ee3\u7801\u8fdb\u884c\u672c\u5730\u5f00\u53d1\u3002\u672c\u6587\u5c06\u4e3a\u4f60\u4ecb\u7ecd\u5982\u4f55\u4f7f\u7528 git \u547d\u4ee4\u6b63\u786e\u5730\u66f4\u65b0\u4ed3\u5e93\u3002<\/p>\n

\u66f4\u65b0\u8fdc\u7a0b\u4ed3\u5e93<\/p>\n

\u5982\u679c\u4f60\u60f3\u8981\u5c06\u672c\u5730\u4ee3\u7801\u540c\u6b65\u5230\u8fdc\u7a0b\u4ed3\u5e93\u4e2d\uff0c\u90a3\u4e48\u4f60\u9700\u8981\u4f7f\u7528 Git \u7684 push \u547d\u4ee4\u3002<\/p>\n

\u8bed\u6cd5\u5982\u4e0b\uff1a<\/p>\n

git push <remote> <branch><\/pre>\n
  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
\u5176\u4e2d\uff0cremote \u8868\u793a\u8fdc\u7a0b\u4ed3\u5e93\u7684\u540d\u79f0\uff0cbranch \u8868\u793a\u9700\u8981\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\u7684\u5206\u652f\u540d\u79f0\u3002<\/p>\n
\u4f8b\u5982\uff0c\u5c06\u672c\u5730 master \u5206\u652f\u4ee3\u7801\u63a8\u9001\u5230\u540d\u4e3a origin \u7684\u8fdc\u7a0b\u4ed3\u5e93\uff1a<\/p>\n
git push origin master<\/pre>\n
  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
\u66f4\u65b0\u672c\u5730\u4ed3\u5e93<\/p>\n
\u5982\u679c\u4f60\u60f3\u8981\u4ece\u8fdc\u7a0b\u4ed3\u5e93\u4e2d\u83b7\u53d6\u6700\u65b0\u7684\u4ee3\u7801\u5230\u672c\u5730\u4ed3\u5e93\u4e2d\uff0c\u90a3\u4e48\u4f60\u9700\u8981\u4f7f\u7528 Git \u7684 fetch \u548c merge \u547d\u4ee4\u3002<\/p>\n
\u9996\u5148\uff0c\u4f7f\u7528 fetch \u547d\u4ee4\u4ece\u8fdc\u7a0b\u4ed3\u5e93\u4e2d\u83b7\u53d6\u6700\u65b0\u7684\u4ee3\u7801\u3002<\/p>\n
\u8bed\u6cd5\u5982\u4e0b\uff1a<\/p>\n
git fetch <remote><\/pre>\n
  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
\u5176\u4e2d\uff0cremote \u8868\u793a\u8fdc\u7a0b\u4ed3\u5e93\u7684\u540d\u79f0\u3002<\/p>\n
\u4f8b\u5982\uff0c\u4ece\u540d\u4e3a origin \u7684\u8fdc\u7a0b\u4ed3\u5e93\u4e2d\u83b7\u53d6\u6700\u65b0\u7684\u4ee3\u7801\uff1a<\/p>\n
git fetch origin<\/pre>\n
  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
\u4f7f\u7528 merge \u547d\u4ee4\u5c06\u83b7\u53d6\u5230\u7684\u4ee3\u7801\u5408\u5e76\u5230\u672c\u5730\u4ed3\u5e93\u4e2d\u3002<\/p>\n
\u8bed\u6cd5\u5982\u4e0b\uff1a<\/p>\n
git merge <remote>\/<branch><\/pre>\n
  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
\u5176\u4e2d\uff0cremote \u8868\u793a\u8fdc\u7a0b\u4ed3\u5e93\u7684\u540d\u79f0\uff0cbranch \u8868\u793a\u9700\u8981\u5408\u5e76\u7684\u5206\u652f\u540d\u79f0\u3002<\/p>\n
\u4f8b\u5982\uff0c\u5c06\u540d\u4e3a origin \u7684\u8fdc\u7a0b\u4ed3\u5e93\u4e2d\u7684 master \u5206\u652f\u5408\u5e76\u5230\u672c\u5730\u7684 master \u5206\u652f\uff1a<\/p>\n
git merge origin\/master<\/pre>\n
  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
\u6ce8\u610f\u4e8b\u9879<\/p>\n
\u5728\u6267\u884c\u8fdc\u7a0b\u4ed3\u5e93\u66f4\u65b0\u64cd\u4f5c\u65f6\uff0c\u4f60\u9700\u8981\u5148\u62c9\u53d6\u6700\u65b0\u7684\u4ee3\u7801\uff0c\u5e76\u4e14\u89e3\u51b3\u53ef\u80fd\u5b58\u5728\u7684\u51b2\u7a81\uff0c\u7136\u540e\u518d\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\u3002\u5426\u5219\uff0c\u4f60\u7684\u4ee3\u7801\u53ef\u80fd\u4f1a\u8986\u76d6\u5176\u4ed6\u4eba\u7684\u4ee3\u7801\uff0c\u4ece\u800c\u5bfc\u81f4\u4ee3\u7801\u4e22\u5931\u3002<\/p>\n
\u5728\u6267\u884c\u672c\u5730\u4ed3\u5e93\u66f4\u65b0\u64cd\u4f5c\u65f6\uff0c\u4f60\u9700\u8981\u5c0f\u5fc3\u53ef\u80fd\u5b58\u5728\u7684\u51b2\u7a81\u3002\u5982\u679c\u53d1\u751f\u51b2\u7a81\uff0c\u4f60\u9700\u8981\u624b\u52a8\u89e3\u51b3\u51b2\u7a81\u5e76\u63d0\u4ea4\u89e3\u51b3\u65b9\u6848\u3002\u5426\u5219\uff0cGit \u65e0\u6cd5\u6b63\u5e38\u7684\u5408\u5e76\u4ee3\u7801\u3002<\/p>\n
\u7ed3\u8bba<\/p>\n
\u901a\u8fc7\u672c\u6587\uff0c\u4f60\u5df2\u7ecf\u638c\u63e1\u4e86\u5982\u4f55\u6b63\u786e\u7684\u66f4\u65b0 Git \u4ed3\u5e93\u7684\u65b9\u6cd5\u3002\u5b9e\u8df5\u4e2d\uff0c\u4f60\u53ef\u4ee5\u6839\u636e\u9700\u8981\u6dfb\u52a0\u6216\u5220\u9664\u6587\u4ef6\u3001\u89e3\u51b3\u4ee3\u7801\u51b2\u7a81\u7b49\u3002\u5e0c\u671b\u4f60\u53ef\u4ee5\u5728\u4f7f\u7528 Git \u8fdb\u884c\u534f\u4f5c\u5f00\u53d1\u7684\u8fc7\u7a0b\u4e2d\u987a\u5229\u5730\u5b8c\u6210\u4efb\u52a1\u3002<\/p>\n
\u4ee5\u4e0a\u5c31\u662f\u5982\u4f55\u6b63\u786e\u5730\u66f4\u65b0 Git \u4ed3\u5e93\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":"
\u5728\u4f7f\u7528 git \u8fdb\u884c\u534f\u4f5c\u5f00\u53d1\u7684\u8fc7\u7a0b\u4e2d\uff0c\u4f60\u53ef\u80fd\u9700\u8981\u5c06\u672c\u5730\u4ed3\u5e93\u540c\u6b65\u66f4\u65b0\u5230\u8fdc\u7a0b\u4ed3\u5e93\u4e0a\u6216\u8005\u4ece\u8fdc\u7a0b\u4ed3\u5e93\u4e2d\u83b7\u53d6\u6700\u65b0\u7684\u4ee3\u7801\u8fdb\u884c\u672c\u5730\u5f00\u53d1\u3002\u672c\u6587\u5c06\u4e3a\u4f60\u4ecb\u7ecd\u5982\u4f55\u4f7f\u7528 git \u547d\u4ee4\u6b63\u786e\u5730\u66f4\u65b0\u4ed3\u5e93\u3002 \u66f4\u65b0\u8fdc\u7a0b\u4ed3\u5e93 \u5982\u679c\u4f60\u60f3\u8981\u5c06\u672c\u5730\u4ee3\u7801\u540c\u6b65\u5230\u8fdc\u7a0b\u4ed3\u5e93\u4e2d\uff0c\u90a3\u4e48\u4f60\u9700\u8981\u4f7f\u7528 Git \u7684 push \u547d\u4ee4\u3002 \u8bed\u6cd5\u5982\u4e0b\uff1a git push <remote> <branch> \u767b\u5f55\u540e\u590d\u5236 \u5176\u4e2d\uff0cremote \u8868\u793a\u8fdc\u7a0b\u4ed3\u5e93\u7684\u540d\u79f0\uff0cbranch \u8868\u793a\u9700\u8981\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\u7684\u5206\u652f\u540d\u79f0\u3002 \u4f8b\u5982\uff0c\u5c06\u672c\u5730 master \u5206\u652f\u4ee3\u7801\u63a8\u9001\u5230\u540d\u4e3a origin \u7684\u8fdc\u7a0b\u4ed3\u5e93\uff1a git push origin master \u767b\u5f55\u540e\u590d\u5236 \u66f4\u65b0\u672c\u5730\u4ed3\u5e93 \u5982\u679c\u4f60\u60f3\u8981\u4ece\u8fdc\u7a0b\u4ed3\u5e93\u4e2d\u83b7\u53d6\u6700\u65b0\u7684\u4ee3\u7801\u5230\u672c\u5730\u4ed3\u5e93\u4e2d\uff0c\u90a3\u4e48\u4f60\u9700\u8981\u4f7f\u7528 Git \u7684 fetch \u548c merge \u547d\u4ee4\u3002 \u9996\u5148\uff0c\u4f7f\u7528 fetch \u547d\u4ee4\u4ece\u8fdc\u7a0b\u4ed3\u5e93\u4e2d\u83b7\u53d6\u6700\u65b0\u7684\u4ee3\u7801\u3002 \u8bed\u6cd5\u5982\u4e0b\uff1a git fetch <remote> \u767b\u5f55\u540e\u590d\u5236 \u5176\u4e2d\uff0cremote \u8868\u793a\u8fdc\u7a0b\u4ed3\u5e93\u7684\u540d\u79f0\u3002 \u4f8b\u5982\uff0c\u4ece\u540d\u4e3a origin \u7684\u8fdc\u7a0b\u4ed3\u5e93\u4e2d\u83b7\u53d6\u6700\u65b0\u7684\u4ee3\u7801\uff1a git fetch origin \u767b\u5f55\u540e\u590d\u5236 […]<\/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-19338","post","type-post","status-publish","format-standard","hentry","category-16"],"_links":{"self":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/19338","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=19338"}],"version-history":[{"count":0,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/19338\/revisions"}],"wp:attachment":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/media?parent=19338"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/categories?post=19338"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/tags?post=19338"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}