{"id":19077,"date":"2024-11-19T16:11:19","date_gmt":"2024-11-19T08:11:19","guid":{"rendered":"https:\/\/fwq.ai\/blog\/19077\/"},"modified":"2024-11-19T16:11:19","modified_gmt":"2024-11-19T08:11:19","slug":"%e6%b7%b1%e6%9e%90git%e8%a7%a3%e5%86%b3%e5%86%b2%e7%aa%81%e6%ad%a5%e9%aa%a4","status":"publish","type":"post","link":"https:\/\/fwq.ai\/blog\/19077\/","title":{"rendered":"\u6df1\u6790git\u89e3\u51b3\u51b2\u7a81\u6b65\u9aa4"},"content":{"rendered":"

\u5728\u591a\u4eba\u534f\u4f5c\u5f00\u53d1\u4e2d\u7ecf\u5e38\u4f1a\u9047\u5230\u4ee3\u7801\u51b2\u7a81\u7684\u60c5\u51b5\uff0c\u8fd9\u65f6\u5c31\u9700\u8981\u4f7f\u7528 git \u6765\u89e3\u51b3\u4ee3\u7801\u51b2\u7a81\u3002<\/p>\n

Git \u662f\u4e00\u4e2a\u7248\u672c\u63a7\u5236\u5de5\u5177\uff0c\u5b83\u53ef\u4ee5\u8ba9\u6211\u4eec\u8f7b\u677e\u5730\u5bf9\u4ee3\u7801\u8fdb\u884c\u7ba1\u7406\u548c\u534f\u4f5c\u5f00\u53d1\u3002\u4e0b\u9762\u4ecb\u7ecd\u7684\u5c31\u662f\u5728 Git \u4e2d\u5982\u4f55\u89e3\u51b3\u4ee3\u7801\u51b2\u7a81\u7684\u8be6\u7ec6\u6b65\u9aa4\u3002<\/p>\n

    \n
  1. \u786e\u5b9a\u51b2\u7a81<\/li>\n<\/ol>\n

    \u5728\u8fdb\u884c\u4ee3\u7801\u4fee\u6539\u4e4b\u524d\uff0c\u9996\u5148\u8981\u786e\u8ba4\u672c\u5730\u4ee3\u7801\u5e93\u548c\u8fdc\u7a0b\u4ee3\u7801\u5e93\u7684\u7248\u672c\u662f\u5426\u4e00\u81f4\uff0c\u5982\u679c\u4e0d\u4e00\u81f4\u5c31\u9700\u8981\u5c06\u672c\u5730\u4ee3\u7801\u5e93\u4e0e\u8fdc\u7a0b\u4ee3\u7801\u5e93\u8fdb\u884c\u540c\u6b65\u3002\u5728\u540c\u6b65\u5b8c\u6210\u4e4b\u540e\uff0c\u8fdb\u884c\u4ee3\u7801\u7684\u4fee\u6539\uff0c\u5e76\u63d0\u4ea4\u5230\u672c\u5730\u4ee3\u7801\u5e93\u3002\u5728\u8fd9\u4e2a\u8fc7\u7a0b\u4e2d\uff0c\u5982\u679c\u6709\u5176\u4ed6\u4eba\u5bf9\u4ee3\u7801\u8fdb\u884c\u4e86\u4fee\u6539\uff0c\u5e76\u63d0\u4ea4\u5230\u4e86\u8fdc\u7a0b\u4ee3\u7801\u5e93\u4e2d\uff0c\u90a3\u4e48\u5c31\u4f1a\u4ea7\u751f\u4ee3\u7801\u51b2\u7a81\u3002<\/p>\n

      \n
    1. \u6267\u884c\u4ee3\u7801\u51b2\u7a81\u68c0\u67e5<\/li>\n<\/ol>\n

      Git \u63d0\u4f9b\u4e86\u4e00\u79cd\u4ee3\u7801\u51b2\u7a81\u68c0\u67e5\u5de5\u5177\uff0c\u53ef\u4ee5\u5e2e\u52a9\u6211\u4eec\u68c0\u67e5\u4ee3\u7801\u51b2\u7a81\u3002\u6267\u884c\u4ee5\u4e0b\u547d\u4ee4\uff1a<\/p>\n

      git checkout <branch>\ngit merge <target_branch><\/pre>\n
        \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
      \u5176\u4e2d\uff0c  \u6307\u7684\u662f\u5f53\u524d\u672c\u5730\u4ee3\u7801\u5e93\u7684\u5206\u652f\uff0c  \u6307\u7684\u662f\u51b2\u7a81\u7684\u76ee\u6807\u5206\u652f\u3002\u6267\u884c\u4ee5\u4e0a\u547d\u4ee4\u540e\uff0cGit \u4f1a\u81ea\u52a8\u8fdb\u884c\u4ee3\u7801\u51b2\u7a81\u68c0\u67e5\u3002\u5982\u679c\u6709\u4ee3\u7801\u51b2\u7a81\uff0c\u5219\u4f1a\u63d0\u793a\u7528\u6237\u8fdb\u884c\u89e3\u51b3\u3002\u5982\u679c\u4ee3\u7801\u6ca1\u6709\u51b2\u7a81\uff0c\u5219\u4f1a\u63d0\u793a\u5408\u5e76\u6210\u529f\u3002  <\/p>\n
        \n
      1. \u89e3\u51b3\u4ee3\u7801\u51b2\u7a81<\/li>\n<\/ol>\n
        \u5982\u679c\u68c0\u67e5\u5230\u4e86\u4ee3\u7801\u51b2\u7a81\uff0c\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u7684\u65b9\u5f0f\u6765\u89e3\u51b3\u4ee3\u7801\u51b2\u7a81\uff1a<\/p>\n
        \uff081\uff09\u8fdb\u5165\u4ee3\u7801\u51b2\u7a81\u6587\u4ef6\u7684\u76ee\u5f55\uff1a<\/p>\n
        cd <folder><\/pre>\n
          \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
        \uff082\uff09\u4f7f\u7528\u7f16\u8f91\u5668\u6253\u5f00\u51b2\u7a81\u6587\u4ef6\uff0c\u5e76\u67e5\u627e\u5230\u51b2\u7a81\u4ee3\u7801\u7684\u4f4d\u7f6e\u3002<\/p>\n
        \uff083\uff09\u624b\u52a8\u4fee\u6539\u51b2\u7a81\u4ee3\u7801\uff0c\u5220\u9664\u51b2\u7a81\u884c\uff0c\u4fdd\u7559\u9700\u8981\u7684\u4ee3\u7801\u884c\u3002<\/p>\n
        \uff084\uff09\u7ecf\u8fc7\u4fee\u6539\u4e4b\u540e\uff0c\u4fdd\u5b58\u51b2\u7a81\u6587\u4ef6\uff0c\u5e76\u5173\u95ed\u7f16\u8f91\u5668\u3002<\/p>\n
        \uff085\uff09\u6267\u884c\u4ee5\u4e0b\u547d\u4ee4\u8fdb\u884c\u63d0\u4ea4\uff1a<\/p>\n
        git add <file>\ngit commit -m \"merge conflict resolved\"<\/pre>\n
          \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
        \u89e3\u51b3\u51b2\u7a81\u4e4b\u540e\uff0c\u5c31\u53ef\u4ee5\u7ee7\u7eed\u8fdb\u884c\u4ee3\u7801\u4fee\u6539\u548c\u63d0\u4ea4\u4e86\u3002<\/p>\n
          \n
        1. \u63a8\u9001\u4ee3\u7801<\/li>\n<\/ol>\n
          \u5728\u4ee3\u7801\u89e3\u51b3\u51b2\u7a81\u4e4b\u540e\uff0c\u9700\u8981\u5c06\u4ee3\u7801\u63a8\u9001\u5230\u8fdc\u7a0b\u4ee3\u7801\u5e93\uff1a<\/p>\n
          git push origin <branch><\/pre>\n
            \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
          \u5176\u4e2d\uff0c  \u6307\u7684\u662f\u5f53\u524d\u672c\u5730\u4ee3\u7801\u5e93\u7684\u5206\u652f\u3002 <\/p>\n
          \u603b\u7ed3<\/p>\n
          \u4ee3\u7801\u51b2\u7a81\u662f\u5728\u591a\u4eba\u534f\u4f5c\u5f00\u53d1\u4e2d\u5e38\u89c1\u7684\u95ee\u9898\uff0c\u4f46\u662f\u4f7f\u7528 Git \u53ef\u4ee5\u5f88\u65b9\u4fbf\u5730\u89e3\u51b3\u8fd9\u4e2a\u95ee\u9898\u3002\u5728\u5b9e\u9645\u5e94\u7528\u4e2d\uff0c\u6211\u4eec\u9700\u8981\u6839\u636e\u4e0d\u540c\u7684\u60c5\u51b5\u6765\u9009\u62e9\u4e0d\u540c\u7684\u89e3\u51b3\u65b9\u6cd5\uff0c\u907f\u514d\u51fa\u73b0\u66f4\u591a\u7684\u95ee\u9898\u3002\u638c\u63e1\u4e86 Git \u7684\u4f7f\u7528\u65b9\u6cd5\uff0c\u80fd\u591f\u66f4\u597d\u5730\u8fdb\u884c\u4ee3\u7801\u7ba1\u7406\u548c\u534f\u4f5c\u5f00\u53d1\u3002<\/p>\n
          \u4ee5\u4e0a\u5c31\u662f\u6df1\u6790git\u89e3\u51b3\u51b2\u7a81\u6b65\u9aa4\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\u591a\u4eba\u534f\u4f5c\u5f00\u53d1\u4e2d\u7ecf\u5e38\u4f1a\u9047\u5230\u4ee3\u7801\u51b2\u7a81\u7684\u60c5\u51b5\uff0c\u8fd9\u65f6\u5c31\u9700\u8981\u4f7f\u7528 git \u6765\u89e3\u51b3\u4ee3\u7801\u51b2\u7a81\u3002 Git \u662f\u4e00\u4e2a\u7248\u672c\u63a7\u5236\u5de5\u5177\uff0c\u5b83\u53ef\u4ee5\u8ba9\u6211\u4eec\u8f7b\u677e\u5730\u5bf9\u4ee3\u7801\u8fdb\u884c\u7ba1\u7406\u548c\u534f\u4f5c\u5f00\u53d1\u3002\u4e0b\u9762\u4ecb\u7ecd\u7684\u5c31\u662f\u5728 Git \u4e2d\u5982\u4f55\u89e3\u51b3\u4ee3\u7801\u51b2\u7a81\u7684\u8be6\u7ec6\u6b65\u9aa4\u3002 \u786e\u5b9a\u51b2\u7a81 \u5728\u8fdb\u884c\u4ee3\u7801\u4fee\u6539\u4e4b\u524d\uff0c\u9996\u5148\u8981\u786e\u8ba4\u672c\u5730\u4ee3\u7801\u5e93\u548c\u8fdc\u7a0b\u4ee3\u7801\u5e93\u7684\u7248\u672c\u662f\u5426\u4e00\u81f4\uff0c\u5982\u679c\u4e0d\u4e00\u81f4\u5c31\u9700\u8981\u5c06\u672c\u5730\u4ee3\u7801\u5e93\u4e0e\u8fdc\u7a0b\u4ee3\u7801\u5e93\u8fdb\u884c\u540c\u6b65\u3002\u5728\u540c\u6b65\u5b8c\u6210\u4e4b\u540e\uff0c\u8fdb\u884c\u4ee3\u7801\u7684\u4fee\u6539\uff0c\u5e76\u63d0\u4ea4\u5230\u672c\u5730\u4ee3\u7801\u5e93\u3002\u5728\u8fd9\u4e2a\u8fc7\u7a0b\u4e2d\uff0c\u5982\u679c\u6709\u5176\u4ed6\u4eba\u5bf9\u4ee3\u7801\u8fdb\u884c\u4e86\u4fee\u6539\uff0c\u5e76\u63d0\u4ea4\u5230\u4e86\u8fdc\u7a0b\u4ee3\u7801\u5e93\u4e2d\uff0c\u90a3\u4e48\u5c31\u4f1a\u4ea7\u751f\u4ee3\u7801\u51b2\u7a81\u3002 \u6267\u884c\u4ee3\u7801\u51b2\u7a81\u68c0\u67e5 Git \u63d0\u4f9b\u4e86\u4e00\u79cd\u4ee3\u7801\u51b2\u7a81\u68c0\u67e5\u5de5\u5177\uff0c\u53ef\u4ee5\u5e2e\u52a9\u6211\u4eec\u68c0\u67e5\u4ee3\u7801\u51b2\u7a81\u3002\u6267\u884c\u4ee5\u4e0b\u547d\u4ee4\uff1a git checkout <branch> git merge <target_branch> \u767b\u5f55\u540e\u590d\u5236 \u5176\u4e2d\uff0c \u6307\u7684\u662f\u5f53\u524d\u672c\u5730\u4ee3\u7801\u5e93\u7684\u5206\u652f\uff0c \u6307\u7684\u662f\u51b2\u7a81\u7684\u76ee\u6807\u5206\u652f\u3002\u6267\u884c\u4ee5\u4e0a\u547d\u4ee4\u540e\uff0cGit \u4f1a\u81ea\u52a8\u8fdb\u884c\u4ee3\u7801\u51b2\u7a81\u68c0\u67e5\u3002\u5982\u679c\u6709\u4ee3\u7801\u51b2\u7a81\uff0c\u5219\u4f1a\u63d0\u793a\u7528\u6237\u8fdb\u884c\u89e3\u51b3\u3002\u5982\u679c\u4ee3\u7801\u6ca1\u6709\u51b2\u7a81\uff0c\u5219\u4f1a\u63d0\u793a\u5408\u5e76\u6210\u529f\u3002 \u89e3\u51b3\u4ee3\u7801\u51b2\u7a81 \u5982\u679c\u68c0\u67e5\u5230\u4e86\u4ee3\u7801\u51b2\u7a81\uff0c\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u7684\u65b9\u5f0f\u6765\u89e3\u51b3\u4ee3\u7801\u51b2\u7a81\uff1a \uff081\uff09\u8fdb\u5165\u4ee3\u7801\u51b2\u7a81\u6587\u4ef6\u7684\u76ee\u5f55\uff1a cd <folder> \u767b\u5f55\u540e\u590d\u5236 \uff082\uff09\u4f7f\u7528\u7f16\u8f91\u5668\u6253\u5f00\u51b2\u7a81\u6587\u4ef6\uff0c\u5e76\u67e5\u627e\u5230\u51b2\u7a81\u4ee3\u7801\u7684\u4f4d\u7f6e\u3002 \uff083\uff09\u624b\u52a8\u4fee\u6539\u51b2\u7a81\u4ee3\u7801\uff0c\u5220\u9664\u51b2\u7a81\u884c\uff0c\u4fdd\u7559\u9700\u8981\u7684\u4ee3\u7801\u884c\u3002 \uff084\uff09\u7ecf\u8fc7\u4fee\u6539\u4e4b\u540e\uff0c\u4fdd\u5b58\u51b2\u7a81\u6587\u4ef6\uff0c\u5e76\u5173\u95ed\u7f16\u8f91\u5668\u3002 \uff085\uff09\u6267\u884c\u4ee5\u4e0b\u547d\u4ee4\u8fdb\u884c\u63d0\u4ea4\uff1a git add <file> git commit -m “merge conflict resolved” \u767b\u5f55\u540e\u590d\u5236 \u89e3\u51b3\u51b2\u7a81\u4e4b\u540e\uff0c\u5c31\u53ef\u4ee5\u7ee7\u7eed\u8fdb\u884c\u4ee3\u7801\u4fee\u6539\u548c\u63d0\u4ea4\u4e86\u3002 \u63a8\u9001\u4ee3\u7801 \u5728\u4ee3\u7801\u89e3\u51b3\u51b2\u7a81\u4e4b\u540e\uff0c\u9700\u8981\u5c06\u4ee3\u7801\u63a8\u9001\u5230\u8fdc\u7a0b\u4ee3\u7801\u5e93\uff1a git push origin <branch> \u767b\u5f55\u540e\u590d\u5236 \u5176\u4e2d\uff0c \u6307\u7684\u662f\u5f53\u524d\u672c\u5730\u4ee3\u7801\u5e93\u7684\u5206\u652f\u3002 \u603b\u7ed3 \u4ee3\u7801\u51b2\u7a81\u662f\u5728\u591a\u4eba\u534f\u4f5c\u5f00\u53d1\u4e2d\u5e38\u89c1\u7684\u95ee\u9898\uff0c\u4f46\u662f\u4f7f\u7528 […]<\/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-19077","post","type-post","status-publish","format-standard","hentry","category-16"],"_links":{"self":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/19077","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=19077"}],"version-history":[{"count":0,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/19077\/revisions"}],"wp:attachment":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/media?parent=19077"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/categories?post=19077"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/tags?post=19077"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}