{"id":19248,"date":"2024-11-19T16:00:20","date_gmt":"2024-11-19T08:00:20","guid":{"rendered":"https:\/\/fwq.ai\/blog\/19248\/"},"modified":"2024-11-19T16:00:20","modified_gmt":"2024-11-19T08:00:20","slug":"%e5%a6%82%e4%bd%95%e5%9c%a8git%e4%b8%ad%e4%bf%ae%e6%94%b9%e5%88%86%e6%94%af%e7%9a%84%e5%90%8d%e5%ad%97","status":"publish","type":"post","link":"https:\/\/fwq.ai\/blog\/19248\/","title":{"rendered":"\u5982\u4f55\u5728Git\u4e2d\u4fee\u6539\u5206\u652f\u7684\u540d\u5b57"},"content":{"rendered":"

\u5728\u4f7f\u7528git\u8fdb\u884c\u5f00\u53d1\u7684\u8fc7\u7a0b\u4e2d\uff0c\u6211\u4eec\u5e38\u5e38\u9700\u8981\u5bf9\u5206\u652f\u8fdb\u884c\u64cd\u4f5c\uff0c\u800c\u4fee\u6539\u5206\u652f\u7684\u540d\u5b57\u5c31\u662f\u4e00\u4e2a\u5e38\u89c1\u7684\u64cd\u4f5c\u3002\u4e0b\u9762\uff0c\u6211\u4eec\u5c31\u6765\u4ecb\u7ecd\u4e00\u4e0b\u5982\u4f55\u5728git\u4e2d\u4fee\u6539\u5206\u652f\u7684\u540d\u5b57\u3002<\/p>\n

1. \u67e5\u770b\u5206\u652f<\/h4>\n

\u5728\u4fee\u6539\u5206\u652f\u7684\u540d\u5b57\u4e4b\u524d\uff0c\u6211\u4eec\u9996\u5148\u9700\u8981\u901a\u8fc7git branch\u547d\u4ee4\u67e5\u770b\u5f53\u524d\u5b58\u5728\u7684\u5206\u652f\uff0c\u4ee5\u786e\u8ba4\u6211\u4eec\u9700\u8981\u4fee\u6539\u54ea\u4e2a\u5206\u652f\u7684\u540d\u5b57\u3002\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u67e5\u770b\u5206\u652f\uff1a<\/p>\n

$ git branch\n  master\n* develop\n  feature-A\n  feature-B<\/pre>\n
  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
\u4e0a\u8ff0\u547d\u4ee4\u4f1a\u5217\u51fa\u5f53\u524d\u6240\u6709\u7684\u672c\u5730\u5206\u652f\uff0c\u5e76\u7528*\u53f7\u6807\u8bc6\u5f53\u524d\u6240\u5728\u7684\u5206\u652f\uff08\u5728\u4e0a\u8ff0\u4f8b\u5b50\u4e2d\uff0c\u5f53\u524d\u6240\u5728\u7684\u5206\u652f\u662fdevelop\u5206\u652f\uff09\u3002<\/p>\n
2. \u91cd\u547d\u540d\u5206\u652f<\/h4>\n
\u786e\u5b9a\u9700\u8981\u4fee\u6539\u7684\u5206\u652f\u540e\uff0c\u6211\u4eec\u53ef\u4ee5\u4f7f\u7528git branch -m\u547d\u4ee4\u6765\u4fee\u6539\u5206\u652f\u540d\u5b57\u3002\u8be5\u547d\u4ee4\u7684\u8bed\u6cd5\u4e3a\uff1a<\/p>\n
$ git branch -m oldbranch newbranch<\/pre>\n
  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
\u5176\u4e2d\uff0coldbranch\u662f\u8981\u4fee\u6539\u7684\u5206\u652f\u7684\u539f\u540d\u5b57\uff0cnewbranch\u662f\u8981\u4fee\u6539\u7684\u5206\u652f\u7684\u65b0\u540d\u5b57\u3002<\/p>\n
\u6bd4\u5982\uff0c\u6211\u4eec\u9700\u8981\u5c06\u540d\u4e3afeature-A\u7684\u5206\u652f\u91cd\u547d\u540d\u4e3afeature-C\uff0c\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\uff1a<\/p>\n
$ git branch -m feature-A feature-C<\/pre>\n
  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
3. \u63a8\u9001\u4fee\u6539\u540e\u7684\u5206\u652f<\/h4>\n
\u5728\u5c06\u672c\u5730\u5206\u652f\u540d\u5b57\u4fee\u6539\u5b8c\u6210\u540e\uff0c\u6211\u4eec\u9700\u8981\u5c06\u4fee\u6539\u540e\u7684\u5206\u652f\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\u4e2d\u3002\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u5c06\u4fee\u6539\u540e\u7684\u5206\u652f\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\u4e2d\uff1a<\/p>\n
$ git push origin :oldbranch newbranch<\/pre>\n
  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
\u5176\u4e2d\uff0coldbranch\u662f\u8981\u4fee\u6539\u7684\u5206\u652f\u7684\u539f\u540d\u5b57\uff0cnewbranch\u662f\u8981\u4fee\u6539\u7684\u5206\u652f\u7684\u65b0\u540d\u5b57\u3002<\/p>\n
\u6bd4\u5982\uff0c\u6211\u4eec\u9700\u8981\u5c06\u540d\u4e3afeature-A\u7684\u5206\u652f\u91cd\u547d\u540d\u4e3afeature-C\uff0c\u5e76\u5c06\u4fee\u6539\u540e\u7684\u5206\u652f\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\uff0c\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\uff1a<\/p>\n
$ git push origin :feature-A feature-C<\/pre>\n
  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
4. \u5220\u9664\u65e7\u540d\u5b57\u7684\u5206\u652f<\/h4>\n
\u5982\u679c\u6211\u4eec\u4e0d\u9700\u8981\u4fdd\u7559\u65e7\u540d\u5b57\u7684\u5206\u652f\uff0c\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u5c06\u5176\u5220\u9664\uff1a<\/p>\n
$ git push origin :oldbranch<\/pre>\n
  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
\u4ee5\u4e0a\u5c31\u662f\u4f7f\u7528Git\u4fee\u6539\u5206\u652f\u540d\u5b57\u7684\u6b65\u9aa4\uff0c\u5f53\u7136\uff0c\u4f7f\u7528\u524d\u8bf7\u8c28\u614e\u8003\u8651\uff0c\u907f\u514d\u8bef\u64cd\u4f5c\u3002<\/p>\n
\u4ee5\u4e0a\u5c31\u662f\u5982\u4f55\u5728Git\u4e2d\u4fee\u6539\u5206\u652f\u7684\u540d\u5b57\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\u7528git\u8fdb\u884c\u5f00\u53d1\u7684\u8fc7\u7a0b\u4e2d\uff0c\u6211\u4eec\u5e38\u5e38\u9700\u8981\u5bf9\u5206\u652f\u8fdb\u884c\u64cd\u4f5c\uff0c\u800c\u4fee\u6539\u5206\u652f\u7684\u540d\u5b57\u5c31\u662f\u4e00\u4e2a\u5e38\u89c1\u7684\u64cd\u4f5c\u3002\u4e0b\u9762\uff0c\u6211\u4eec\u5c31\u6765\u4ecb\u7ecd\u4e00\u4e0b\u5982\u4f55\u5728git\u4e2d\u4fee\u6539\u5206\u652f\u7684\u540d\u5b57\u3002 1. \u67e5\u770b\u5206\u652f \u5728\u4fee\u6539\u5206\u652f\u7684\u540d\u5b57\u4e4b\u524d\uff0c\u6211\u4eec\u9996\u5148\u9700\u8981\u901a\u8fc7git branch\u547d\u4ee4\u67e5\u770b\u5f53\u524d\u5b58\u5728\u7684\u5206\u652f\uff0c\u4ee5\u786e\u8ba4\u6211\u4eec\u9700\u8981\u4fee\u6539\u54ea\u4e2a\u5206\u652f\u7684\u540d\u5b57\u3002\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u67e5\u770b\u5206\u652f\uff1a $ git branch master * develop feature-A feature-B \u767b\u5f55\u540e\u590d\u5236 \u4e0a\u8ff0\u547d\u4ee4\u4f1a\u5217\u51fa\u5f53\u524d\u6240\u6709\u7684\u672c\u5730\u5206\u652f\uff0c\u5e76\u7528*\u53f7\u6807\u8bc6\u5f53\u524d\u6240\u5728\u7684\u5206\u652f\uff08\u5728\u4e0a\u8ff0\u4f8b\u5b50\u4e2d\uff0c\u5f53\u524d\u6240\u5728\u7684\u5206\u652f\u662fdevelop\u5206\u652f\uff09\u3002 2. \u91cd\u547d\u540d\u5206\u652f \u786e\u5b9a\u9700\u8981\u4fee\u6539\u7684\u5206\u652f\u540e\uff0c\u6211\u4eec\u53ef\u4ee5\u4f7f\u7528git branch -m\u547d\u4ee4\u6765\u4fee\u6539\u5206\u652f\u540d\u5b57\u3002\u8be5\u547d\u4ee4\u7684\u8bed\u6cd5\u4e3a\uff1a $ git branch -m oldbranch newbranch \u767b\u5f55\u540e\u590d\u5236 \u5176\u4e2d\uff0coldbranch\u662f\u8981\u4fee\u6539\u7684\u5206\u652f\u7684\u539f\u540d\u5b57\uff0cnewbranch\u662f\u8981\u4fee\u6539\u7684\u5206\u652f\u7684\u65b0\u540d\u5b57\u3002 \u6bd4\u5982\uff0c\u6211\u4eec\u9700\u8981\u5c06\u540d\u4e3afeature-A\u7684\u5206\u652f\u91cd\u547d\u540d\u4e3afeature-C\uff0c\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\uff1a $ git branch -m feature-A feature-C \u767b\u5f55\u540e\u590d\u5236 3. \u63a8\u9001\u4fee\u6539\u540e\u7684\u5206\u652f \u5728\u5c06\u672c\u5730\u5206\u652f\u540d\u5b57\u4fee\u6539\u5b8c\u6210\u540e\uff0c\u6211\u4eec\u9700\u8981\u5c06\u4fee\u6539\u540e\u7684\u5206\u652f\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\u4e2d\u3002\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u5c06\u4fee\u6539\u540e\u7684\u5206\u652f\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\u4e2d\uff1a $ git push origin :oldbranch newbranch \u767b\u5f55\u540e\u590d\u5236 \u5176\u4e2d\uff0coldbranch\u662f\u8981\u4fee\u6539\u7684\u5206\u652f\u7684\u539f\u540d\u5b57\uff0cnewbranch\u662f\u8981\u4fee\u6539\u7684\u5206\u652f\u7684\u65b0\u540d\u5b57\u3002 \u6bd4\u5982\uff0c\u6211\u4eec\u9700\u8981\u5c06\u540d\u4e3afeature-A\u7684\u5206\u652f\u91cd\u547d\u540d\u4e3afeature-C\uff0c\u5e76\u5c06\u4fee\u6539\u540e\u7684\u5206\u652f\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\uff0c\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\uff1a $ git push origin :feature-A feature-C \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-19248","post","type-post","status-publish","format-standard","hentry","category-16"],"_links":{"self":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/19248","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=19248"}],"version-history":[{"count":0,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/19248\/revisions"}],"wp:attachment":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/media?parent=19248"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/categories?post=19248"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/tags?post=19248"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}