{"id":19600,"date":"2024-11-19T15:04:06","date_gmt":"2024-11-19T07:04:06","guid":{"rendered":"https:\/\/fwq.ai\/blog\/19600\/"},"modified":"2024-11-19T15:04:06","modified_gmt":"2024-11-19T07:04:06","slug":"gitlab%e8%af%b7%e6%b1%82%e5%90%88%e5%b9%b6%e5%87%ba%e7%8e%b0%e4%b8%8d%e4%b8%80%e8%87%b4%e9%97%ae%e9%a2%98%e6%80%8e%e4%b9%88%e8%a7%a3%e5%86%b3","status":"publish","type":"post","link":"https:\/\/fwq.ai\/blog\/19600\/","title":{"rendered":"gitlab\u8bf7\u6c42\u5408\u5e76\u51fa\u73b0\u4e0d\u4e00\u81f4\u95ee\u9898\u600e\u4e48\u89e3\u51b3"},"content":{"rendered":"

\u5728gitlab\u7684\u534f\u4f5c\u5f00\u53d1\u4e2d\uff0c\u8bf7\u6c42\u5408\u5e76\uff08merge request\uff09\u662f\u975e\u5e38\u91cd\u8981\u7684\u73af\u8282\u4e4b\u4e00\u3002\u5b83\u5141\u8bb8\u4e0d\u540c\u5f00\u53d1\u8005\u5728\u81ea\u5df1\u7684\u5206\u652f\u4e0a\u5f00\u53d1\u5e76\u63d0\u4ea4\u4ee3\u7801\uff0c\u7136\u540e\u5411\u4e3b\u5206\u652f\u53d1\u8d77\u8bf7\u6c42\u5408\u5e76\uff0c\u6700\u7ec8\u5c06\u4ee3\u7801\u5408\u5e76\u5230\u4e3b\u5206\u652f\u4e0a\u3002\u7136\u800c\uff0c\u6709\u65f6\u5019\u4f60\u53ef\u80fd\u4f1a\u9047\u5230\u8bf7\u6c42\u5408\u5e76\u65f6\u51fa\u73b0\u7684\u4e0d\u4e00\u81f4\u95ee\u9898\uff0c\u672c\u6587\u5c06\u63a2\u8ba8\u5176\u4e2d\u7684\u539f\u56e0\u548c\u89e3\u51b3\u529e\u6cd5\u3002<\/p>\n

\u4e00\u3001\u4ec0\u4e48\u662f\u8bf7\u6c42\u5408\u5e76\u4e0d\u4e00\u81f4<\/p>\n

\u5f53\u4f60\u53d1\u8d77\u4e00\u4e2a\u8bf7\u6c42\u5408\u5e76\u65f6\uff0cGitLab\u4f1a\u81ea\u52a8\u5c06\u4f60\u7684\u5206\u652f\u4e0e\u76ee\u6807\u5206\u652f\u8fdb\u884c\u5408\u5e76\uff0c\u5e76\u5c06\u5408\u5e76\u540e\u7684\u7ed3\u679c\u4e0e\u76ee\u6807\u5206\u652f\u8fdb\u884c\u6bd4\u8f83\u3002\u5982\u679c\u5408\u5e76\u540e\u7684\u4ee3\u7801\u4e0e\u76ee\u6807\u5206\u652f\u7684\u4ee3\u7801\u6709\u51b2\u7a81\u6216\u8005\u4e0d\u4e00\u81f4\u7684\u5730\u65b9\uff0c\u90a3\u4e48GitLab\u5c31\u4f1a\u63d0\u793a\u8bf7\u6c42\u5408\u5e76\u4e0d\u4e00\u81f4\u3002<\/p>\n

\u4e8c\u3001\u8bf7\u6c42\u5408\u5e76\u4e0d\u4e00\u81f4\u7684\u539f\u56e0<\/p>\n

1.\u5206\u652f\u5df2\u7ecf\u8fc7\u671f<\/p>\n

\u5982\u679c\u4f60\u7684\u5206\u652f\u5df2\u7ecf\u8fc7\u671f\uff0c\u5373\u6ca1\u6709\u6309\u7167\u4e3b\u5206\u652f\u7684\u6700\u65b0\u4fee\u6539\u8fdb\u884c\u66f4\u65b0\uff0c\u90a3\u4e48\u53d1\u8d77\u8bf7\u6c42\u5408\u5e76\u65f6\u5c31\u4f1a\u53d1\u751f\u4e0d\u4e00\u81f4\u95ee\u9898\u3002\u8fd9\u662f\u56e0\u4e3a\u5408\u5e76\u540e\u7684\u4ee3\u7801\u53ef\u80fd\u4e0e\u4e3b\u5206\u652f\u7684\u6700\u65b0\u4fee\u6539\u4ea7\u751f\u51b2\u7a81\u3002<\/p>\n

2.\u5b58\u5728\u4ee3\u7801\u51b2\u7a81<\/p>\n

\u5b58\u5728\u4ee3\u7801\u51b2\u7a81\u662f\u8bf7\u6c42\u5408\u5e76\u4e0d\u4e00\u81f4\u7684\u5e38\u89c1\u539f\u56e0\u3002\u5f53\u4f60\u7684\u5206\u652f\u4e0e\u76ee\u6807\u5206\u652f\u4e0a\u7684\u4ee3\u7801\u53d1\u751f\u51b2\u7a81\u65f6\uff0cGitLab\u4f1a\u63d0\u793a\u8bf7\u6c42\u5408\u5e76\u4e0d\u4e00\u81f4\u3002<\/p>\n

3.\u672a\u89e3\u51b3\u7684\u95ee\u9898<\/p>\n

\u5982\u679c\u4f60\u5728\u5206\u652f\u4e0a\u8fdb\u884c\u4e86\u4e00\u4e9b\u4fee\u6539\uff0c\u4f46\u662f\u6ca1\u6709\u5b8c\u5168\u89e3\u51b3\u95ee\u9898\uff0c\u90a3\u4e48\u53d1\u8d77\u8bf7\u6c42\u5408\u5e76\u65f6\u4e5f\u4f1a\u53d1\u751f\u4e0d\u4e00\u81f4\u95ee\u9898\u3002\u8fd9\u79cd\u60c5\u51b5\u4e0b\uff0c\u5408\u5e76\u540e\u7684\u4ee3\u7801\u53ef\u80fd\u4f1a\u5f15\u5165\u65b0\u7684\u95ee\u9898\u6216\u6539\u53d8\u539f\u6709\u7684\u529f\u80fd\uff0c\u5bfc\u81f4\u4e0e\u76ee\u6807\u5206\u652f\u7684\u4ee3\u7801\u4e0d\u4e00\u81f4\u3002<\/p>\n

\u4e09\u3001\u8bf7\u6c42\u5408\u5e76\u4e0d\u4e00\u81f4\u7684\u89e3\u51b3\u529e\u6cd5<\/p>\n

1.\u66f4\u65b0\u5206\u652f<\/p>\n

\u5f53\u4f60\u7684\u5206\u652f\u8fc7\u671f\u65f6\uff0c\u53ef\u4ee5\u901a\u8fc7\u66f4\u65b0\u5206\u652f\u5230\u6700\u65b0\u4fee\u6539\u89e3\u51b3\u8bf7\u6c42\u5408\u5e76\u4e0d\u4e00\u81f4\u7684\u95ee\u9898\u3002\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u66f4\u65b0\u672c\u5730\u5206\u652f\uff1a<\/p>\n

git fetch origin        \/\/ \u83b7\u53d6\u6700\u65b0\u4fee\u6539\ngit checkout <branch>   \/\/ \u5207\u6362\u5230\u4f60\u7684\u5206\u652f\ngit merge origin\/main   \/\/ \u5408\u5e76\u6700\u65b0\u4fee\u6539\u5230\u4f60\u7684\u5206\u652f<\/pre>\n
  \u767b\u5f55\u540e\u590d\u5236    \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
\u5728\u66f4\u65b0\u5206\u652f\u4e4b\u540e\uff0c\u91cd\u65b0\u53d1\u8d77\u8bf7\u6c42\u5408\u5e76\u5373\u53ef\u3002<\/p>\n
2.\u89e3\u51b3\u4ee3\u7801\u51b2\u7a81<\/p>\n
\u5f53\u5b58\u5728\u4ee3\u7801\u51b2\u7a81\u65f6\uff0c\u9700\u8981\u624b\u52a8\u8fdb\u884c\u89e3\u51b3\u3002\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u4e0e\u76ee\u6807\u5206\u652f\u8fdb\u884c\u5408\u5e76\uff1a<\/p>\n
git fetch origin        \/\/ \u83b7\u53d6\u6700\u65b0\u4fee\u6539\ngit checkout <branch>   \/\/ \u5207\u6362\u5230\u4f60\u7684\u5206\u652f\ngit merge origin\/main   \/\/ \u5408\u5e76\u6700\u65b0\u4fee\u6539\u5230\u4f60\u7684\u5206\u652f<\/pre>\n
  \u767b\u5f55\u540e\u590d\u5236    \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
\u5728\u5408\u5e76\u65f6\uff0cGit\u4f1a\u81ea\u52a8\u68c0\u6d4b\u4ee3\u7801\u51b2\u7a81\uff0c\u4f46\u662f\u5e76\u4e0d\u4f1a\u81ea\u52a8\u89e3\u51b3\u3002\u9700\u8981\u624b\u52a8\u6839\u636e\u63d0\u793a\u8fdb\u884c\u4ee3\u7801\u4fee\u6539\uff0c\u76f4\u5230\u6240\u6709\u7684\u51b2\u7a81\u90fd\u88ab\u89e3\u51b3\u3002\u6700\u540e\uff0c\u63d0\u4ea4\u4fee\u6539\u5e76\u91cd\u65b0\u53d1\u8d77\u8bf7\u6c42\u5408\u5e76\u5373\u53ef\u3002<\/p>\n
3.\u89e3\u51b3\u672a\u89e3\u51b3\u7684\u95ee\u9898<\/p>\n
\u5bf9\u4e8e\u672a\u89e3\u51b3\u7684\u95ee\u9898\uff0c\u9700\u8981\u5728\u672c\u5730\u8fdb\u884c\u5b8c\u5168\u6d4b\u8bd5\u548c\u89e3\u51b3\uff0c\u786e\u4fdd\u4ee3\u7801\u4fee\u6539\u4e0d\u4f1a\u5f71\u54cd\u539f\u6709\u7684\u529f\u80fd\uff0c\u5e76\u4e14\u4e0d\u4f1a\u5f15\u5165\u65b0\u7684\u95ee\u9898\u3002\u5f53\u4f60\u786e\u8ba4\u4ee3\u7801\u4fee\u6539\u5df2\u7ecf\u89e3\u51b3\u95ee\u9898\u540e\uff0c\u63d0\u4ea4\u4fee\u6539\u5e76\u91cd\u65b0\u53d1\u8d77\u8bf7\u6c42\u5408\u5e76\u5373\u53ef\u3002<\/p>\n
\u56db\u3001\u7ed3\u8bed<\/p>\n
\u8bf7\u6c42\u5408\u5e76\u662fGitLab\u534f\u4f5c\u5f00\u53d1\u4e2d\u975e\u5e38\u91cd\u8981\u7684\u73af\u8282\uff0c\u4e5f\u662f\u56e2\u961f\u534f\u4f5c\u7684\u57fa\u7840\u3002\u5f53\u8bf7\u6c42\u5408\u5e76\u4e0d\u4e00\u81f4\u65f6\uff0c\u6211\u4eec\u9700\u8981\u4e86\u89e3\u5176\u539f\u56e0\u5e76\u91c7\u53d6\u76f8\u5e94\u7684\u89e3\u51b3\u529e\u6cd5\u3002\u901a\u8fc7\u4e0a\u8ff0\u7684\u65b9\u6cd5\uff0c\u76f8\u4fe1\u4f60\u5df2\u7ecf\u638c\u63e1\u4e86\u5982\u4f55\u89e3\u51b3GitLab\u8bf7\u6c42\u5408\u5e76\u4e0d\u4e00\u81f4\u7684\u95ee\u9898\uff0c\u8981\u5728\u534f\u4f5c\u4e2d\u987a\u5229\u8fd0\u4f5c\uff0c\u8fd8\u9700\u4e0d\u65ad\u5b66\u4e60\u548c\u5b9e\u8df5\u3002<\/p>\n
\u4ee5\u4e0a\u5c31\u662fgitlab\u8bf7\u6c42\u5408\u5e76\u51fa\u73b0\u4e0d\u4e00\u81f4\u95ee\u9898\u600e\u4e48\u89e3\u51b3\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":"
\u5728gitlab\u7684\u534f\u4f5c\u5f00\u53d1\u4e2d\uff0c\u8bf7\u6c42\u5408\u5e76\uff08merge request\uff09\u662f\u975e\u5e38\u91cd\u8981\u7684\u73af\u8282\u4e4b\u4e00\u3002\u5b83\u5141\u8bb8\u4e0d\u540c\u5f00\u53d1\u8005\u5728\u81ea\u5df1\u7684\u5206\u652f\u4e0a\u5f00\u53d1\u5e76\u63d0\u4ea4\u4ee3\u7801\uff0c\u7136\u540e\u5411\u4e3b\u5206\u652f\u53d1\u8d77\u8bf7\u6c42\u5408\u5e76\uff0c\u6700\u7ec8\u5c06\u4ee3\u7801\u5408\u5e76\u5230\u4e3b\u5206\u652f\u4e0a\u3002\u7136\u800c\uff0c\u6709\u65f6\u5019\u4f60\u53ef\u80fd\u4f1a\u9047\u5230\u8bf7\u6c42\u5408\u5e76\u65f6\u51fa\u73b0\u7684\u4e0d\u4e00\u81f4\u95ee\u9898\uff0c\u672c\u6587\u5c06\u63a2\u8ba8\u5176\u4e2d\u7684\u539f\u56e0\u548c\u89e3\u51b3\u529e\u6cd5\u3002 \u4e00\u3001\u4ec0\u4e48\u662f\u8bf7\u6c42\u5408\u5e76\u4e0d\u4e00\u81f4 \u5f53\u4f60\u53d1\u8d77\u4e00\u4e2a\u8bf7\u6c42\u5408\u5e76\u65f6\uff0cGitLab\u4f1a\u81ea\u52a8\u5c06\u4f60\u7684\u5206\u652f\u4e0e\u76ee\u6807\u5206\u652f\u8fdb\u884c\u5408\u5e76\uff0c\u5e76\u5c06\u5408\u5e76\u540e\u7684\u7ed3\u679c\u4e0e\u76ee\u6807\u5206\u652f\u8fdb\u884c\u6bd4\u8f83\u3002\u5982\u679c\u5408\u5e76\u540e\u7684\u4ee3\u7801\u4e0e\u76ee\u6807\u5206\u652f\u7684\u4ee3\u7801\u6709\u51b2\u7a81\u6216\u8005\u4e0d\u4e00\u81f4\u7684\u5730\u65b9\uff0c\u90a3\u4e48GitLab\u5c31\u4f1a\u63d0\u793a\u8bf7\u6c42\u5408\u5e76\u4e0d\u4e00\u81f4\u3002 \u4e8c\u3001\u8bf7\u6c42\u5408\u5e76\u4e0d\u4e00\u81f4\u7684\u539f\u56e0 1.\u5206\u652f\u5df2\u7ecf\u8fc7\u671f \u5982\u679c\u4f60\u7684\u5206\u652f\u5df2\u7ecf\u8fc7\u671f\uff0c\u5373\u6ca1\u6709\u6309\u7167\u4e3b\u5206\u652f\u7684\u6700\u65b0\u4fee\u6539\u8fdb\u884c\u66f4\u65b0\uff0c\u90a3\u4e48\u53d1\u8d77\u8bf7\u6c42\u5408\u5e76\u65f6\u5c31\u4f1a\u53d1\u751f\u4e0d\u4e00\u81f4\u95ee\u9898\u3002\u8fd9\u662f\u56e0\u4e3a\u5408\u5e76\u540e\u7684\u4ee3\u7801\u53ef\u80fd\u4e0e\u4e3b\u5206\u652f\u7684\u6700\u65b0\u4fee\u6539\u4ea7\u751f\u51b2\u7a81\u3002 2.\u5b58\u5728\u4ee3\u7801\u51b2\u7a81 \u5b58\u5728\u4ee3\u7801\u51b2\u7a81\u662f\u8bf7\u6c42\u5408\u5e76\u4e0d\u4e00\u81f4\u7684\u5e38\u89c1\u539f\u56e0\u3002\u5f53\u4f60\u7684\u5206\u652f\u4e0e\u76ee\u6807\u5206\u652f\u4e0a\u7684\u4ee3\u7801\u53d1\u751f\u51b2\u7a81\u65f6\uff0cGitLab\u4f1a\u63d0\u793a\u8bf7\u6c42\u5408\u5e76\u4e0d\u4e00\u81f4\u3002 3.\u672a\u89e3\u51b3\u7684\u95ee\u9898 \u5982\u679c\u4f60\u5728\u5206\u652f\u4e0a\u8fdb\u884c\u4e86\u4e00\u4e9b\u4fee\u6539\uff0c\u4f46\u662f\u6ca1\u6709\u5b8c\u5168\u89e3\u51b3\u95ee\u9898\uff0c\u90a3\u4e48\u53d1\u8d77\u8bf7\u6c42\u5408\u5e76\u65f6\u4e5f\u4f1a\u53d1\u751f\u4e0d\u4e00\u81f4\u95ee\u9898\u3002\u8fd9\u79cd\u60c5\u51b5\u4e0b\uff0c\u5408\u5e76\u540e\u7684\u4ee3\u7801\u53ef\u80fd\u4f1a\u5f15\u5165\u65b0\u7684\u95ee\u9898\u6216\u6539\u53d8\u539f\u6709\u7684\u529f\u80fd\uff0c\u5bfc\u81f4\u4e0e\u76ee\u6807\u5206\u652f\u7684\u4ee3\u7801\u4e0d\u4e00\u81f4\u3002 \u4e09\u3001\u8bf7\u6c42\u5408\u5e76\u4e0d\u4e00\u81f4\u7684\u89e3\u51b3\u529e\u6cd5 1.\u66f4\u65b0\u5206\u652f \u5f53\u4f60\u7684\u5206\u652f\u8fc7\u671f\u65f6\uff0c\u53ef\u4ee5\u901a\u8fc7\u66f4\u65b0\u5206\u652f\u5230\u6700\u65b0\u4fee\u6539\u89e3\u51b3\u8bf7\u6c42\u5408\u5e76\u4e0d\u4e00\u81f4\u7684\u95ee\u9898\u3002\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u66f4\u65b0\u672c\u5730\u5206\u652f\uff1a git fetch origin \/\/ \u83b7\u53d6\u6700\u65b0\u4fee\u6539 git checkout <branch> \/\/ \u5207\u6362\u5230\u4f60\u7684\u5206\u652f git merge origin\/main \/\/ \u5408\u5e76\u6700\u65b0\u4fee\u6539\u5230\u4f60\u7684\u5206\u652f \u767b\u5f55\u540e\u590d\u5236 \u767b\u5f55\u540e\u590d\u5236 \u5728\u66f4\u65b0\u5206\u652f\u4e4b\u540e\uff0c\u91cd\u65b0\u53d1\u8d77\u8bf7\u6c42\u5408\u5e76\u5373\u53ef\u3002 2.\u89e3\u51b3\u4ee3\u7801\u51b2\u7a81 \u5f53\u5b58\u5728\u4ee3\u7801\u51b2\u7a81\u65f6\uff0c\u9700\u8981\u624b\u52a8\u8fdb\u884c\u89e3\u51b3\u3002\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u4e0e\u76ee\u6807\u5206\u652f\u8fdb\u884c\u5408\u5e76\uff1a git fetch origin \/\/ \u83b7\u53d6\u6700\u65b0\u4fee\u6539 git checkout <branch> \/\/ \u5207\u6362\u5230\u4f60\u7684\u5206\u652f git merge origin\/main \/\/ \u5408\u5e76\u6700\u65b0\u4fee\u6539\u5230\u4f60\u7684\u5206\u652f \u767b\u5f55\u540e\u590d\u5236 \u767b\u5f55\u540e\u590d\u5236 \u5728\u5408\u5e76\u65f6\uff0cGit\u4f1a\u81ea\u52a8\u68c0\u6d4b\u4ee3\u7801\u51b2\u7a81\uff0c\u4f46\u662f\u5e76\u4e0d\u4f1a\u81ea\u52a8\u89e3\u51b3\u3002\u9700\u8981\u624b\u52a8\u6839\u636e\u63d0\u793a\u8fdb\u884c\u4ee3\u7801\u4fee\u6539\uff0c\u76f4\u5230\u6240\u6709\u7684\u51b2\u7a81\u90fd\u88ab\u89e3\u51b3\u3002\u6700\u540e\uff0c\u63d0\u4ea4\u4fee\u6539\u5e76\u91cd\u65b0\u53d1\u8d77\u8bf7\u6c42\u5408\u5e76\u5373\u53ef\u3002 3.\u89e3\u51b3\u672a\u89e3\u51b3\u7684\u95ee\u9898 \u5bf9\u4e8e\u672a\u89e3\u51b3\u7684\u95ee\u9898\uff0c\u9700\u8981\u5728\u672c\u5730\u8fdb\u884c\u5b8c\u5168\u6d4b\u8bd5\u548c\u89e3\u51b3\uff0c\u786e\u4fdd\u4ee3\u7801\u4fee\u6539\u4e0d\u4f1a\u5f71\u54cd\u539f\u6709\u7684\u529f\u80fd\uff0c\u5e76\u4e14\u4e0d\u4f1a\u5f15\u5165\u65b0\u7684\u95ee\u9898\u3002\u5f53\u4f60\u786e\u8ba4\u4ee3\u7801\u4fee\u6539\u5df2\u7ecf\u89e3\u51b3\u95ee\u9898\u540e\uff0c\u63d0\u4ea4\u4fee\u6539\u5e76\u91cd\u65b0\u53d1\u8d77\u8bf7\u6c42\u5408\u5e76\u5373\u53ef\u3002 \u56db\u3001\u7ed3\u8bed […]<\/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-19600","post","type-post","status-publish","format-standard","hentry","category-16"],"_links":{"self":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/19600","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=19600"}],"version-history":[{"count":0,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/19600\/revisions"}],"wp:attachment":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/media?parent=19600"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/categories?post=19600"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/tags?post=19600"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}