{"id":19736,"date":"2024-11-19T15:03:35","date_gmt":"2024-11-19T07:03:35","guid":{"rendered":"https:\/\/fwq.ai\/blog\/19736\/"},"modified":"2024-11-19T15:03:35","modified_gmt":"2024-11-19T07:03:35","slug":"%e5%a6%82%e4%bd%95%e5%9c%a8gitlab%e4%b8%8a%e5%90%8c%e6%ad%a5%e4%b8%a4%e4%b8%aa%e4%b8%8d%e5%90%8c%e7%9a%84%e5%88%86%e6%94%af","status":"publish","type":"post","link":"https:\/\/fwq.ai\/blog\/19736\/","title":{"rendered":"\u5982\u4f55\u5728GitLab\u4e0a\u540c\u6b65\u4e24\u4e2a\u4e0d\u540c\u7684\u5206\u652f"},"content":{"rendered":"

gitlab\u662f\u4e00\u6b3e\u6e90\u4ee3\u7801\u7ba1\u7406\u5e73\u53f0\uff0c\u5b83\u63d0\u4f9b\u4e86\u8bb8\u591a\u5de5\u5177\u6765\u5e2e\u52a9\u7a0b\u5e8f\u5458\u7ba1\u7406\u5176\u6e90\u4ee3\u7801\u3002\u5728\u534f\u4f5c\u5f00\u53d1\u4e2d\u7ecf\u5e38\u4f1a\u6d89\u53ca\u5230\u5206\u652f\u64cd\u4f5c\uff0c\u5206\u652f\u53ef\u4ee5\u5c06\u4e0d\u540c\u7684\u4ee3\u7801\u5206\u79bb\u5f00\u6765\u8fdb\u884c\u5f00\u53d1\u548c\u6d4b\u8bd5\uff0c\u4f46\u53ef\u80fd\u51fa\u73b0\u5206\u652f\u4e4b\u95f4\u4e0d\u540c\u6b65\u7684\u95ee\u9898\u3002\u4e0b\u9762\u6211\u4eec\u5c31\u6765\u8ba8\u8bba\u4e00\u4e0b\u5982\u4f55\u5728gitlab\u4e0a\u540c\u6b65\u4e24\u4e2a\u4e0d\u540c\u7684\u5206\u652f\u3002<\/p>\n

1.\u4f7f\u7528\u5408\u5e76\u8bf7\u6c42<\/p>\n

\u5408\u5e76\u8bf7\u6c42\u662f GitLab \u91cc\u9762\u7684\u4e00\u4e2a\u7279\u6027\uff0c\u5b83\u53ef\u4ee5\u5e2e\u52a9\u6211\u4eec\u5b9e\u73b0\u5206\u652f\u4e4b\u95f4\u7684\u5408\u5e76\u64cd\u4f5c\uff0c\u8ba9\u5206\u652f\u4e4b\u95f4\u7684\u4ee3\u7801\u540c\u6b65\u3002<\/p>\n

\u9996\u5148\uff0c\u6211\u4eec\u9700\u8981\u5728\u4e24\u4e2a\u4e0d\u540c\u7684\u5206\u652f\u4e0a\u505a\u51fa\u4e00\u4e9b\u4ee3\u7801\u4fee\u6539\uff0c\u7136\u540e\u63d0\u4ea4\u5b83\u4eec\u3002\u63a5\u7740\uff0c\u6211\u4eec\u5728\u76ee\u6807\u5206\u652f\u4e0a\u521b\u5efa\u4e00\u4e2a\u5408\u5e76\u8bf7\u6c42\uff0c\u5e76\u9009\u62e9\u9700\u8981\u5408\u5e76\u7684\u6e90\u5206\u652f\uff0c\u70b9\u51fb\u201c\u63d0\u4ea4\u5408\u5e76\u8bf7\u6c42\u201d\u6309\u94ae\u3002\u6b64\u65f6\uff0cGitLab \u5c31\u4f1a\u81ea\u52a8\u68c0\u6d4b\u6211\u4eec\u505a\u51fa\u7684\u4fee\u6539\uff0c\u5e76\u7ed9\u6211\u4eec\u63d0\u4f9b\u4e00\u4e9b\u8be6\u7ec6\u4fe1\u606f\u548c\u9009\u62e9\u5408\u5e76\u7684\u9009\u9879\u3002\u6211\u4eec\u53ef\u4ee5\u67e5\u770b\u4fee\u6539\u7684\u5177\u4f53\u5185\u5bb9\u3001\u6587\u4ef6\u5dee\u5f02\u548c\u63d0\u4ea4\u65e5\u5fd7\uff0c\u5e76\u6839\u636e\u9700\u8981\u9009\u62e9\u4e0d\u540c\u7684\u5408\u5e76\u65b9\u5f0f\u3002<\/p>\n

\u5728\u9009\u62e9\u4e86\u5408\u5e76\u65b9\u5f0f\u4e4b\u540e\uff0c\u6211\u4eec\u53ef\u4ee5\u5c06\u5408\u5e76\u8bf7\u6c42\u63d0\u4ea4\u7ed9\u5176\u4ed6\u7684\u5f00\u53d1\u4eba\u5458\u8fdb\u884c\u5ba1\u67e5\u3002\u5ba1\u67e5\u4eba\u5458\u53ef\u4ee5\u67e5\u770b\u4ee3\u7801\u5e76\u63d0\u4f9b\u53cd\u9988\u3001\u5efa\u8bae\u548c\u4fee\u6539\u5efa\u8bae\uff0c\u8fd9\u6837\u53ef\u4ee5\u5e2e\u52a9\u6211\u4eec\u5728\u5408\u5e76\u5206\u652f\u4e4b\u524d\u68c0\u67e5\u4ee3\u7801\u8d28\u91cf\u3002<\/p>\n

\u5982\u679c\u68c0\u67e5\u5b8c\u6bd5\u540e\uff0c\u6211\u4eec\u8ba4\u4e3a\u5408\u5e76\u8bf7\u6c42\u5df2\u7ecf\u51c6\u5907\u5c31\u7eea\uff0c\u6211\u4eec\u53ef\u4ee5\u70b9\u51fb\u201c\u5408\u5e76\u8bf7\u6c42\u201d\u6309\u94ae\uff0cGitLab \u5c31\u4f1a\u5c06\u5408\u5e76\u8bf7\u6c42\u4e2d\u7684\u4ee3\u7801\u5408\u5e76\u5230\u76ee\u6807\u5206\u652f\u4e2d\uff0c\u5b8c\u6210\u5206\u652f\u4e4b\u95f4\u7684\u540c\u6b65\u3002<\/p>\n

2.\u4f7f\u7528rebase<\/p>\n

\u5982\u679c\u4e24\u4e2a\u5206\u652f\u4e0a\u7684\u4ee3\u7801\u90fd\u6709\u4fee\u6539\uff0c\u5e76\u4e14\u6211\u4eec\u60f3\u8981\u7528\u6700\u65b0\u7684\u4ee3\u7801\u66ff\u6362\u65e7\u4ee3\u7801\uff0c\u90a3\u4e48\u6211\u4eec\u53ef\u4ee5\u4f7f\u7528rebase\u64cd\u4f5c\u3002\u9996\u5148\uff0c\u6211\u4eec\u9700\u8981\u5207\u6362\u5230\u76ee\u6807\u5206\u652f\u5e76\u62c9\u53d6\u6700\u65b0\u7684\u4ee3\u7801\u3002\u63a5\u7740\uff0c\u6211\u4eec\u4f7f\u7528rebase\u547d\u4ee4\u5c06\u6e90\u5206\u652f\u7684\u6700\u65b0\u4ee3\u7801\u5408\u5e76\u5230\u76ee\u6807\u5206\u652f\u4e2d\uff0c\u8fd9\u6837\u6211\u4eec\u5c31\u53ef\u4ee5\u5c06\u76ee\u6807\u5206\u652f\u7684\u6240\u6709\u4fee\u6539\u5e94\u7528\u5230\u6700\u65b0\u7684\u6e90\u5206\u652f\u4e0a\u3002<\/p>\n

\u5047\u8bbe\u6211\u4eec\u7684\u6e90\u5206\u652f\u662f\u201cbranch-A\u201d\uff0c\u76ee\u6807\u5206\u652f\u662f\u201cbranch-B\u201d\uff0c\u6211\u4eec\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u5c06\u4e24\u4e2a\u5206\u652f\u540c\u6b65\uff1a<\/p>\n

$ git checkout branch-B  \n$ git pull origin branch-B  \n$ git rebase branch-A<\/pre>\n
  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
\u8fd9\u6837\uff0c\u6211\u4eec\u5c31\u53ef\u4ee5\u5c06\u4fee\u6539\u5e94\u7528\u5230\u6700\u65b0\u7684\u4ee3\u7801\u4e0a\uff0c\u5e76\u4e14\u4fdd\u7559\u4e86\u76ee\u6807\u5206\u652f\u4e0a\u7684\u6240\u6709\u4fee\u6539\u3002<\/p>\n
\u7efc\u4e0a\u6240\u8ff0\uff0cgitlab\u540c\u6b65\u4e24\u4e2a\u4e0d\u540c\u7684\u5206\u652f\u53ef\u4ee5\u901a\u8fc7\u5408\u5e76\u8bf7\u6c42\u548crebase\u64cd\u4f5c\u6765\u5b8c\u6210\u3002\u5728\u534f\u4f5c\u5f00\u53d1\u7684\u65f6\u5019\uff0c\u6211\u4eec\u9700\u8981\u6ce8\u610f\u7ef4\u62a4\u5206\u652f\u4e4b\u95f4\u7684\u540c\u6b65\uff0c\u4ee5\u4fdd\u8bc1\u4ee3\u7801\u8d28\u91cf\u548c\u5de5\u4f5c\u6548\u7387\u3002<\/p>\n
\u4ee5\u4e0a\u5c31\u662f\u5982\u4f55\u5728GitLab\u4e0a\u540c\u6b65\u4e24\u4e2a\u4e0d\u540c\u7684\u5206\u652f\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":"
gitlab\u662f\u4e00\u6b3e\u6e90\u4ee3\u7801\u7ba1\u7406\u5e73\u53f0\uff0c\u5b83\u63d0\u4f9b\u4e86\u8bb8\u591a\u5de5\u5177\u6765\u5e2e\u52a9\u7a0b\u5e8f\u5458\u7ba1\u7406\u5176\u6e90\u4ee3\u7801\u3002\u5728\u534f\u4f5c\u5f00\u53d1\u4e2d\u7ecf\u5e38\u4f1a\u6d89\u53ca\u5230\u5206\u652f\u64cd\u4f5c\uff0c\u5206\u652f\u53ef\u4ee5\u5c06\u4e0d\u540c\u7684\u4ee3\u7801\u5206\u79bb\u5f00\u6765\u8fdb\u884c\u5f00\u53d1\u548c\u6d4b\u8bd5\uff0c\u4f46\u53ef\u80fd\u51fa\u73b0\u5206\u652f\u4e4b\u95f4\u4e0d\u540c\u6b65\u7684\u95ee\u9898\u3002\u4e0b\u9762\u6211\u4eec\u5c31\u6765\u8ba8\u8bba\u4e00\u4e0b\u5982\u4f55\u5728gitlab\u4e0a\u540c\u6b65\u4e24\u4e2a\u4e0d\u540c\u7684\u5206\u652f\u3002 1.\u4f7f\u7528\u5408\u5e76\u8bf7\u6c42 \u5408\u5e76\u8bf7\u6c42\u662f GitLab \u91cc\u9762\u7684\u4e00\u4e2a\u7279\u6027\uff0c\u5b83\u53ef\u4ee5\u5e2e\u52a9\u6211\u4eec\u5b9e\u73b0\u5206\u652f\u4e4b\u95f4\u7684\u5408\u5e76\u64cd\u4f5c\uff0c\u8ba9\u5206\u652f\u4e4b\u95f4\u7684\u4ee3\u7801\u540c\u6b65\u3002 \u9996\u5148\uff0c\u6211\u4eec\u9700\u8981\u5728\u4e24\u4e2a\u4e0d\u540c\u7684\u5206\u652f\u4e0a\u505a\u51fa\u4e00\u4e9b\u4ee3\u7801\u4fee\u6539\uff0c\u7136\u540e\u63d0\u4ea4\u5b83\u4eec\u3002\u63a5\u7740\uff0c\u6211\u4eec\u5728\u76ee\u6807\u5206\u652f\u4e0a\u521b\u5efa\u4e00\u4e2a\u5408\u5e76\u8bf7\u6c42\uff0c\u5e76\u9009\u62e9\u9700\u8981\u5408\u5e76\u7684\u6e90\u5206\u652f\uff0c\u70b9\u51fb\u201c\u63d0\u4ea4\u5408\u5e76\u8bf7\u6c42\u201d\u6309\u94ae\u3002\u6b64\u65f6\uff0cGitLab \u5c31\u4f1a\u81ea\u52a8\u68c0\u6d4b\u6211\u4eec\u505a\u51fa\u7684\u4fee\u6539\uff0c\u5e76\u7ed9\u6211\u4eec\u63d0\u4f9b\u4e00\u4e9b\u8be6\u7ec6\u4fe1\u606f\u548c\u9009\u62e9\u5408\u5e76\u7684\u9009\u9879\u3002\u6211\u4eec\u53ef\u4ee5\u67e5\u770b\u4fee\u6539\u7684\u5177\u4f53\u5185\u5bb9\u3001\u6587\u4ef6\u5dee\u5f02\u548c\u63d0\u4ea4\u65e5\u5fd7\uff0c\u5e76\u6839\u636e\u9700\u8981\u9009\u62e9\u4e0d\u540c\u7684\u5408\u5e76\u65b9\u5f0f\u3002 \u5728\u9009\u62e9\u4e86\u5408\u5e76\u65b9\u5f0f\u4e4b\u540e\uff0c\u6211\u4eec\u53ef\u4ee5\u5c06\u5408\u5e76\u8bf7\u6c42\u63d0\u4ea4\u7ed9\u5176\u4ed6\u7684\u5f00\u53d1\u4eba\u5458\u8fdb\u884c\u5ba1\u67e5\u3002\u5ba1\u67e5\u4eba\u5458\u53ef\u4ee5\u67e5\u770b\u4ee3\u7801\u5e76\u63d0\u4f9b\u53cd\u9988\u3001\u5efa\u8bae\u548c\u4fee\u6539\u5efa\u8bae\uff0c\u8fd9\u6837\u53ef\u4ee5\u5e2e\u52a9\u6211\u4eec\u5728\u5408\u5e76\u5206\u652f\u4e4b\u524d\u68c0\u67e5\u4ee3\u7801\u8d28\u91cf\u3002 \u5982\u679c\u68c0\u67e5\u5b8c\u6bd5\u540e\uff0c\u6211\u4eec\u8ba4\u4e3a\u5408\u5e76\u8bf7\u6c42\u5df2\u7ecf\u51c6\u5907\u5c31\u7eea\uff0c\u6211\u4eec\u53ef\u4ee5\u70b9\u51fb\u201c\u5408\u5e76\u8bf7\u6c42\u201d\u6309\u94ae\uff0cGitLab \u5c31\u4f1a\u5c06\u5408\u5e76\u8bf7\u6c42\u4e2d\u7684\u4ee3\u7801\u5408\u5e76\u5230\u76ee\u6807\u5206\u652f\u4e2d\uff0c\u5b8c\u6210\u5206\u652f\u4e4b\u95f4\u7684\u540c\u6b65\u3002 2.\u4f7f\u7528rebase \u5982\u679c\u4e24\u4e2a\u5206\u652f\u4e0a\u7684\u4ee3\u7801\u90fd\u6709\u4fee\u6539\uff0c\u5e76\u4e14\u6211\u4eec\u60f3\u8981\u7528\u6700\u65b0\u7684\u4ee3\u7801\u66ff\u6362\u65e7\u4ee3\u7801\uff0c\u90a3\u4e48\u6211\u4eec\u53ef\u4ee5\u4f7f\u7528rebase\u64cd\u4f5c\u3002\u9996\u5148\uff0c\u6211\u4eec\u9700\u8981\u5207\u6362\u5230\u76ee\u6807\u5206\u652f\u5e76\u62c9\u53d6\u6700\u65b0\u7684\u4ee3\u7801\u3002\u63a5\u7740\uff0c\u6211\u4eec\u4f7f\u7528rebase\u547d\u4ee4\u5c06\u6e90\u5206\u652f\u7684\u6700\u65b0\u4ee3\u7801\u5408\u5e76\u5230\u76ee\u6807\u5206\u652f\u4e2d\uff0c\u8fd9\u6837\u6211\u4eec\u5c31\u53ef\u4ee5\u5c06\u76ee\u6807\u5206\u652f\u7684\u6240\u6709\u4fee\u6539\u5e94\u7528\u5230\u6700\u65b0\u7684\u6e90\u5206\u652f\u4e0a\u3002 \u5047\u8bbe\u6211\u4eec\u7684\u6e90\u5206\u652f\u662f\u201cbranch-A\u201d\uff0c\u76ee\u6807\u5206\u652f\u662f\u201cbranch-B\u201d\uff0c\u6211\u4eec\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u5c06\u4e24\u4e2a\u5206\u652f\u540c\u6b65\uff1a $ git checkout branch-B $ git pull origin branch-B $ git rebase branch-A \u767b\u5f55\u540e\u590d\u5236 \u8fd9\u6837\uff0c\u6211\u4eec\u5c31\u53ef\u4ee5\u5c06\u4fee\u6539\u5e94\u7528\u5230\u6700\u65b0\u7684\u4ee3\u7801\u4e0a\uff0c\u5e76\u4e14\u4fdd\u7559\u4e86\u76ee\u6807\u5206\u652f\u4e0a\u7684\u6240\u6709\u4fee\u6539\u3002 \u7efc\u4e0a\u6240\u8ff0\uff0cgitlab\u540c\u6b65\u4e24\u4e2a\u4e0d\u540c\u7684\u5206\u652f\u53ef\u4ee5\u901a\u8fc7\u5408\u5e76\u8bf7\u6c42\u548crebase\u64cd\u4f5c\u6765\u5b8c\u6210\u3002\u5728\u534f\u4f5c\u5f00\u53d1\u7684\u65f6\u5019\uff0c\u6211\u4eec\u9700\u8981\u6ce8\u610f\u7ef4\u62a4\u5206\u652f\u4e4b\u95f4\u7684\u540c\u6b65\uff0c\u4ee5\u4fdd\u8bc1\u4ee3\u7801\u8d28\u91cf\u548c\u5de5\u4f5c\u6548\u7387\u3002 \u4ee5\u4e0a\u5c31\u662f\u5982\u4f55\u5728GitLab\u4e0a\u540c\u6b65\u4e24\u4e2a\u4e0d\u540c\u7684\u5206\u652f\u7684\u8be6\u7ec6\u5185\u5bb9\uff0c\u66f4\u591a\u8bf7\u5173\u6ce8\u7c73\u4e91\u5176\u5b83\u76f8\u5173\u6587\u7ae0\uff01<\/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-19736","post","type-post","status-publish","format-standard","hentry","category-16"],"_links":{"self":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/19736","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=19736"}],"version-history":[{"count":0,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/19736\/revisions"}],"wp:attachment":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/media?parent=19736"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/categories?post=19736"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/tags?post=19736"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}