{"id":20222,"date":"2024-11-19T11:09:14","date_gmt":"2024-11-19T03:09:14","guid":{"rendered":"https:\/\/fwq.ai\/blog\/20222\/"},"modified":"2024-11-19T11:09:14","modified_gmt":"2024-11-19T03:09:14","slug":"%e6%80%8e%e4%b9%88%e5%b0%86gitlab%e4%b8%8a%e7%9a%84%e6%9b%b4%e6%96%b0%e5%88%b0%e6%9c%ac%e5%9c%b0","status":"publish","type":"post","link":"https:\/\/fwq.ai\/blog\/20222\/","title":{"rendered":"\u600e\u4e48\u5c06gitlab\u4e0a\u7684\u66f4\u65b0\u5230\u672c\u5730"},"content":{"rendered":"

\u5728\u4f7f\u7528git\u8fdb\u884c\u9879\u76ee\u7ba1\u7406\u65f6\uff0c\u6211\u4eec\u7ecf\u5e38\u4f1a\u4f7f\u7528gitlab\u8fd9\u6837\u7684\u4ee3\u7801\u6258\u7ba1\u5e73\u53f0\uff0c\u901a\u8fc7\u5b83\u6765\u7ba1\u7406\u6211\u4eec\u7684\u9879\u76ee\u5e76\u8fdb\u884c\u56e2\u961f\u534f\u4f5c\u3002\u5728\u56e2\u961f\u5f00\u53d1\u7684\u8fc7\u7a0b\u4e2d\uff0c\u9879\u76ee\u7684\u66f4\u65b0\u662f\u4e00\u4e2a\u975e\u5e38\u5e38\u89c1\u7684\u64cd\u4f5c\u3002\u4f46\u662f\uff0c\u5982\u679c\u4e0d\u4e86\u89e3\u5982\u4f55\u5c06gitlab\u4e0a\u7684\u66f4\u65b0\u540c\u6b65\u5230\u672c\u5730\uff0c\u6211\u4eec\u5c31\u4f1a\u9519\u8fc7\u6700\u65b0\u7684\u7248\u672c\uff0c\u8fd9\u4f1a\u4e25\u91cd\u5f71\u54cd\u6211\u4eec\u7684\u5f00\u53d1\u8fdb\u5ea6\u548c\u4ee3\u7801\u8d28\u91cf\u3002\u672c\u6587\u5c06\u4ecb\u7ecd\u5982\u4f55\u5c06gitlab\u4e0a\u7684\u66f4\u65b0\u540c\u6b65\u5230\u672c\u5730\u3002<\/p>\n

    \n
  1. \u786e\u8ba4\u66f4\u65b0<\/li>\n<\/ol>\n

    \u5728\u672c\u5730\u4f7f\u7528Git\u540c\u6b65\u56e2\u961f\u9879\u76ee\u7684\u4ee3\u7801\u65f6\uff0c\u9996\u5148\u8981\u786e\u8ba4\u6709\u6ca1\u6709\u66f4\u65b0\u3002\u6211\u4eec\u53ef\u4ee5\u901a\u8fc7Gitlab\u7684Web\u754c\u9762\u6216\u8005\u547d\u4ee4\u884c\u6765\u67e5\u770b\u6700\u65b0\u7684\u63d0\u4ea4\u4fe1\u606f\uff0c\u7136\u540e\u786e\u8ba4\u56e2\u961f\u4e2d\u662f\u5426\u6709\u65b0\u7684\u66f4\u6539\u3002<\/p>\n

    \u5982\u679c\u6709\u66f4\u65b0\uff0c\u4f60\u9700\u8981\u8bb0\u4f4f\u63d0\u4ea4ID\uff0c\u5b83\u5c06\u7528\u4e8e\u540e\u9762\u7684\u62c9\u53d6\u64cd\u4f5c\u3002<\/p>\n

      \n
    1. \u5c06\u6700\u65b0\u7684\u4ee3\u7801\u62c9\u53d6\u5230\u672c\u5730<\/li>\n<\/ol>\n

      \u5728\u786e\u8ba4\u6709\u66f4\u65b0\u4e4b\u540e\uff0c\u6211\u4eec\u9700\u8981\u5c06\u6700\u65b0\u7684\u4ee3\u7801\u62c9\u53d6\u5230\u672c\u5730\u3002\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u4e24\u79cd\u65b9\u6cd5\uff1a<\/p>\n

      \u547d\u4ee4\u884c\u65b9\u5f0f\uff1a<\/p>\n

      \u5728\u672c\u5730\u7ec8\u7aef\u4e2d\u6253\u5f00\u9879\u76ee\u76ee\u5f55\uff0c\u8f93\u5165\u4ee5\u4e0b\u547d\u4ee4\uff1a<\/p>\n

      git pull<\/pre>\n
        \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
      \u8fd9\u5c06\u4eceGitlab\u4e2d\u62c9\u53d6\u6700\u65b0\u7684\u4ee3\u7801\u3002<\/p>\n
      \u4f7f\u7528Git GUI\uff1a<\/p>\n
      Git GUI\u662f\u53ef\u89c6\u5316\u7684\u56fe\u5f62\u754c\u9762\uff0c\u6211\u4eec\u53ef\u4ee5\u4f7f\u7528\u5b83\u6765\u64cd\u4f5cGit\u547d\u4ee4\u3002\u5728Git GUI\u4e2d\uff0c\u60a8\u53ef\u4ee5\u901a\u8fc7\u70b9\u51fb\u83dc\u5355\u680f\u4e2d\u7684”Pull”\u6309\u94ae\u6765\u62c9\u53d6\u6700\u65b0\u7684\u4ee3\u7801\u3002<\/p>\n
        \n
      1. \u5904\u7406\u4ee3\u7801\u51b2\u7a81<\/li>\n<\/ol>\n
        \u5982\u679c\u4f60\u548c\u5176\u4ed6\u56e2\u961f\u6210\u5458\u540c\u65f6\u4fee\u6539\u4e86\u540c\u4e00\u6587\u4ef6\uff0c\u90a3\u4e48Git\u5c06\u65e0\u6cd5\u81ea\u52a8\u5408\u5e76\u4ee3\u7801\uff0c\u5e76\u663e\u793a\u51b2\u7a81\u3002\u6b64\u65f6\uff0c\u4f60\u9700\u8981\u624b\u52a8\u89e3\u51b3\u8fd9\u4e9b\u51b2\u7a81\uff0c\u7136\u540e\u518d\u63d0\u4ea4\u4ee3\u7801\u3002<\/p>\n
        \u60a8\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u6765\u67e5\u770b\u51b2\u7a81\uff1a<\/p>\n
        git status<\/pre>\n
          \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
        \u5728\u4fee\u590d\u51b2\u7a81\u540e\uff0c\u60a8\u9700\u8981\u5c06\u6587\u4ef6\u6dfb\u52a0\u5230\u672c\u5730\u4ed3\u5e93\uff0c\u7136\u540e\u63d0\u4ea4\u66f4\u6539\uff1a<\/p>\n
        git add <file>\ngit commit -m \"Fix merge conflicts\"<\/file><\/pre>\n
          \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
          \n
        1. \u63a8\u9001\u66f4\u65b0\u5230Gitlab<\/li>\n<\/ol>\n
          \u5728\u5b8c\u6210\u4ee5\u4e0a\u6b65\u9aa4\u4e4b\u540e\uff0c\u60a8\u9700\u8981\u5c06\u672c\u5730\u7684\u66f4\u6539\u63a8\u9001\u5230Gitlab\u3002\u60a8\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u5c06\u4ee3\u7801\u63a8\u9001\u5230Gitlab\uff1a<\/p>\n
          git push<\/pre>\n
            \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
          \u6ce8\u610f\uff0c\u5728\u63a8\u9001\u4e4b\u524d\uff0c\u60a8\u9700\u8981\u5148\u5c06\u6240\u6709\u7684\u672c\u5730\u66f4\u6539\u90fd\u63d0\u4ea4\u5230\u672c\u5730\u4ed3\u5e93\u4e2d\u3002<\/p>\n
          \u603b\u7ed3<\/p>\n
          Git\u662f\u4e00\u4e2a\u5f3a\u5927\u7684\u4ee3\u7801\u7ba1\u7406\u5de5\u5177\uff0c\u53ef\u4ee5\u8ba9\u56e2\u961f\u7684\u5f00\u53d1\u5de5\u4f5c\u66f4\u52a0\u9ad8\u6548\u548c\u4fbf\u6377\u3002\u5728\u56e2\u961f\u4e2d\u534f\u4f5c\u5f00\u53d1\u65f6\uff0c\u6211\u4eec\u7ecf\u5e38\u9700\u8981\u5c06Gitlab\u4e0a\u7684\u66f4\u65b0\u540c\u6b65\u5230\u672c\u5730\u3002\u63a5\u4e0b\u6765\uff0c\u60a8\u53ef\u4ee5\u6309\u7167\u4e0a\u8ff0\u6b65\u9aa4\u64cd\u4f5c\uff0c\u5c06\u6700\u65b0\u7684\u66f4\u6539\u4eceGitlab\u62c9\u53d6\u5230\u672c\u5730\uff0c\u5e76\u89e3\u51b3\u4efb\u4f55\u4ee3\u7801\u51b2\u7a81\uff0c\u6700\u540e\u5c06\u66f4\u6539\u63d0\u4ea4\u5230Gitlab\u3002\u8fd9\u5c06\u786e\u4fdd\u60a8\u7684\u672c\u5730\u9879\u76ee\u662f\u6700\u65b0\u7684\uff0c\u5e76\u4e14\u4e0e\u56e2\u961f\u4e2d\u7684\u5176\u4ed6\u5f00\u53d1\u4eba\u5458\u4e00\u81f4\u3002<\/p>\n
          \u4ee5\u4e0a\u5c31\u662f\u600e\u4e48\u5c06gitlab\u4e0a\u7684\u66f4\u65b0\u5230\u672c\u5730\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\u9879\u76ee\u7ba1\u7406\u65f6\uff0c\u6211\u4eec\u7ecf\u5e38\u4f1a\u4f7f\u7528gitlab\u8fd9\u6837\u7684\u4ee3\u7801\u6258\u7ba1\u5e73\u53f0\uff0c\u901a\u8fc7\u5b83\u6765\u7ba1\u7406\u6211\u4eec\u7684\u9879\u76ee\u5e76\u8fdb\u884c\u56e2\u961f\u534f\u4f5c\u3002\u5728\u56e2\u961f\u5f00\u53d1\u7684\u8fc7\u7a0b\u4e2d\uff0c\u9879\u76ee\u7684\u66f4\u65b0\u662f\u4e00\u4e2a\u975e\u5e38\u5e38\u89c1\u7684\u64cd\u4f5c\u3002\u4f46\u662f\uff0c\u5982\u679c\u4e0d\u4e86\u89e3\u5982\u4f55\u5c06gitlab\u4e0a\u7684\u66f4\u65b0\u540c\u6b65\u5230\u672c\u5730\uff0c\u6211\u4eec\u5c31\u4f1a\u9519\u8fc7\u6700\u65b0\u7684\u7248\u672c\uff0c\u8fd9\u4f1a\u4e25\u91cd\u5f71\u54cd\u6211\u4eec\u7684\u5f00\u53d1\u8fdb\u5ea6\u548c\u4ee3\u7801\u8d28\u91cf\u3002\u672c\u6587\u5c06\u4ecb\u7ecd\u5982\u4f55\u5c06gitlab\u4e0a\u7684\u66f4\u65b0\u540c\u6b65\u5230\u672c\u5730\u3002 \u786e\u8ba4\u66f4\u65b0 \u5728\u672c\u5730\u4f7f\u7528Git\u540c\u6b65\u56e2\u961f\u9879\u76ee\u7684\u4ee3\u7801\u65f6\uff0c\u9996\u5148\u8981\u786e\u8ba4\u6709\u6ca1\u6709\u66f4\u65b0\u3002\u6211\u4eec\u53ef\u4ee5\u901a\u8fc7Gitlab\u7684Web\u754c\u9762\u6216\u8005\u547d\u4ee4\u884c\u6765\u67e5\u770b\u6700\u65b0\u7684\u63d0\u4ea4\u4fe1\u606f\uff0c\u7136\u540e\u786e\u8ba4\u56e2\u961f\u4e2d\u662f\u5426\u6709\u65b0\u7684\u66f4\u6539\u3002 \u5982\u679c\u6709\u66f4\u65b0\uff0c\u4f60\u9700\u8981\u8bb0\u4f4f\u63d0\u4ea4ID\uff0c\u5b83\u5c06\u7528\u4e8e\u540e\u9762\u7684\u62c9\u53d6\u64cd\u4f5c\u3002 \u5c06\u6700\u65b0\u7684\u4ee3\u7801\u62c9\u53d6\u5230\u672c\u5730 \u5728\u786e\u8ba4\u6709\u66f4\u65b0\u4e4b\u540e\uff0c\u6211\u4eec\u9700\u8981\u5c06\u6700\u65b0\u7684\u4ee3\u7801\u62c9\u53d6\u5230\u672c\u5730\u3002\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u4e24\u79cd\u65b9\u6cd5\uff1a \u547d\u4ee4\u884c\u65b9\u5f0f\uff1a \u5728\u672c\u5730\u7ec8\u7aef\u4e2d\u6253\u5f00\u9879\u76ee\u76ee\u5f55\uff0c\u8f93\u5165\u4ee5\u4e0b\u547d\u4ee4\uff1a git pull \u767b\u5f55\u540e\u590d\u5236 \u8fd9\u5c06\u4eceGitlab\u4e2d\u62c9\u53d6\u6700\u65b0\u7684\u4ee3\u7801\u3002 \u4f7f\u7528Git GUI\uff1a Git GUI\u662f\u53ef\u89c6\u5316\u7684\u56fe\u5f62\u754c\u9762\uff0c\u6211\u4eec\u53ef\u4ee5\u4f7f\u7528\u5b83\u6765\u64cd\u4f5cGit\u547d\u4ee4\u3002\u5728Git GUI\u4e2d\uff0c\u60a8\u53ef\u4ee5\u901a\u8fc7\u70b9\u51fb\u83dc\u5355\u680f\u4e2d\u7684”Pull”\u6309\u94ae\u6765\u62c9\u53d6\u6700\u65b0\u7684\u4ee3\u7801\u3002 \u5904\u7406\u4ee3\u7801\u51b2\u7a81 \u5982\u679c\u4f60\u548c\u5176\u4ed6\u56e2\u961f\u6210\u5458\u540c\u65f6\u4fee\u6539\u4e86\u540c\u4e00\u6587\u4ef6\uff0c\u90a3\u4e48Git\u5c06\u65e0\u6cd5\u81ea\u52a8\u5408\u5e76\u4ee3\u7801\uff0c\u5e76\u663e\u793a\u51b2\u7a81\u3002\u6b64\u65f6\uff0c\u4f60\u9700\u8981\u624b\u52a8\u89e3\u51b3\u8fd9\u4e9b\u51b2\u7a81\uff0c\u7136\u540e\u518d\u63d0\u4ea4\u4ee3\u7801\u3002 \u60a8\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u6765\u67e5\u770b\u51b2\u7a81\uff1a git status \u767b\u5f55\u540e\u590d\u5236 \u5728\u4fee\u590d\u51b2\u7a81\u540e\uff0c\u60a8\u9700\u8981\u5c06\u6587\u4ef6\u6dfb\u52a0\u5230\u672c\u5730\u4ed3\u5e93\uff0c\u7136\u540e\u63d0\u4ea4\u66f4\u6539\uff1a git add <file> git commit -m “Fix merge conflicts”<\/file> \u767b\u5f55\u540e\u590d\u5236 \u63a8\u9001\u66f4\u65b0\u5230Gitlab \u5728\u5b8c\u6210\u4ee5\u4e0a\u6b65\u9aa4\u4e4b\u540e\uff0c\u60a8\u9700\u8981\u5c06\u672c\u5730\u7684\u66f4\u6539\u63a8\u9001\u5230Gitlab\u3002\u60a8\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u5c06\u4ee3\u7801\u63a8\u9001\u5230Gitlab\uff1a git push \u767b\u5f55\u540e\u590d\u5236 \u6ce8\u610f\uff0c\u5728\u63a8\u9001\u4e4b\u524d\uff0c\u60a8\u9700\u8981\u5148\u5c06\u6240\u6709\u7684\u672c\u5730\u66f4\u6539\u90fd\u63d0\u4ea4\u5230\u672c\u5730\u4ed3\u5e93\u4e2d\u3002 \u603b\u7ed3 Git\u662f\u4e00\u4e2a\u5f3a\u5927\u7684\u4ee3\u7801\u7ba1\u7406\u5de5\u5177\uff0c\u53ef\u4ee5\u8ba9\u56e2\u961f\u7684\u5f00\u53d1\u5de5\u4f5c\u66f4\u52a0\u9ad8\u6548\u548c\u4fbf\u6377\u3002\u5728\u56e2\u961f\u4e2d\u534f\u4f5c\u5f00\u53d1\u65f6\uff0c\u6211\u4eec\u7ecf\u5e38\u9700\u8981\u5c06Gitlab\u4e0a\u7684\u66f4\u65b0\u540c\u6b65\u5230\u672c\u5730\u3002\u63a5\u4e0b\u6765\uff0c\u60a8\u53ef\u4ee5\u6309\u7167\u4e0a\u8ff0\u6b65\u9aa4\u64cd\u4f5c\uff0c\u5c06\u6700\u65b0\u7684\u66f4\u6539\u4eceGitlab\u62c9\u53d6\u5230\u672c\u5730\uff0c\u5e76\u89e3\u51b3\u4efb\u4f55\u4ee3\u7801\u51b2\u7a81\uff0c\u6700\u540e\u5c06\u66f4\u6539\u63d0\u4ea4\u5230Gitlab\u3002\u8fd9\u5c06\u786e\u4fdd\u60a8\u7684\u672c\u5730\u9879\u76ee\u662f\u6700\u65b0\u7684\uff0c\u5e76\u4e14\u4e0e\u56e2\u961f\u4e2d\u7684\u5176\u4ed6\u5f00\u53d1\u4eba\u5458\u4e00\u81f4\u3002 \u4ee5\u4e0a\u5c31\u662f\u600e\u4e48\u5c06gitlab\u4e0a\u7684\u66f4\u65b0\u5230\u672c\u5730\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-20222","post","type-post","status-publish","format-standard","hentry","category-16"],"_links":{"self":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/20222","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=20222"}],"version-history":[{"count":0,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/20222\/revisions"}],"wp:attachment":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/media?parent=20222"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/categories?post=20222"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/tags?post=20222"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}