{"id":20451,"date":"2024-11-19T16:32:55","date_gmt":"2024-11-19T08:32:55","guid":{"rendered":"https:\/\/fwq.ai\/blog\/20451\/"},"modified":"2024-11-19T16:32:55","modified_gmt":"2024-11-19T08:32:55","slug":"git%e4%bb%a3%e7%a0%81%e5%90%88%e5%b9%b6%e6%8a%80%e5%b7%a7%ef%bc%9a%e9%a1%b9%e7%9b%ae%e7%bb%8f%e9%aa%8c%e5%88%86%e4%ba%ab","status":"publish","type":"post","link":"https:\/\/fwq.ai\/blog\/20451\/","title":{"rendered":"Git\u4ee3\u7801\u5408\u5e76\u6280\u5de7\uff1a\u9879\u76ee\u7ecf\u9a8c\u5206\u4eab"},"content":{"rendered":"

\"Git\u4ee3\u7801\u5408\u5e76\u6280\u5de7\uff1a\u9879\u76ee\u7ecf\u9a8c\u5206\u4eab\u63d2\u56fe\"<\/p>\n

Git\u4ee3\u7801\u5408\u5e76\u6280\u5de7\uff1a\u9879\u76ee\u7ecf\u9a8c\u5206\u4eab<\/p>\n

\u5728\u8f6f\u4ef6\u5f00\u53d1\u8fc7\u7a0b\u4e2d\uff0c\u4ee3\u7801\u5408\u5e76\u662f\u4e00\u4e2a\u975e\u5e38\u91cd\u8981\u7684\u73af\u8282\u3002\u7279\u522b\u662f\u5728\u591a\u4eba\u534f\u4f5c\u5f00\u53d1\u7684\u9879\u76ee\u4e2d\uff0c\u4e0d\u540c\u5f00\u53d1\u8005\u6240\u521b\u5efa\u7684\u5206\u652f\u9700\u8981\u8fdb\u884c\u5408\u5e76\uff0c\u4ee5\u786e\u4fdd\u4ee3\u7801\u7684\u5b8c\u6574\u6027\u548c\u4e00\u81f4\u6027\u3002\u672c\u6587\u5c06\u5206\u4eab\u4e00\u4e9bGit\u4ee3\u7801\u5408\u5e76\u7684\u6280\u5de7\u548c\u7ecf\u9a8c\uff0c\u5e2e\u52a9\u5f00\u53d1\u8005\u66f4\u52a0\u9ad8\u6548\u5730\u8fdb\u884c\u4ee3\u7801\u5408\u5e76\u3002<\/p>\n

\u4e00\u3001\u4fdd\u6301\u5206\u652f\u7684\u5e72\u51c0\u548c\u540c\u6b65<\/p>\n

\u5728\u8fdb\u884c\u4ee3\u7801\u5408\u5e76\u4e4b\u524d\uff0c\u9996\u5148\u8981\u786e\u4fdd\u81ea\u5df1\u7684\u5206\u652f\u662f\u5e72\u51c0\u548c\u540c\u6b65\u7684\u3002\u5e72\u51c0\u7684\u610f\u601d\u662f\u8be5\u5206\u652f\u4e0d\u5e94\u8be5\u5305\u542b\u4efb\u4f55\u672a\u63d0\u4ea4\u7684\u4ee3\u7801\u4fee\u6539\uff0c\u800c\u540c\u6b65\u7684\u610f\u601d\u662f\u5206\u652f\u5e94\u8be5\u57fa\u4e8e\u6700\u65b0\u7684\u4e3b\u5206\u652f\u8fdb\u884c\u5f00\u53d1\u3002<\/p>\n

\u4e3a\u4e86\u4fdd\u6301\u5206\u652f\u7684\u5e72\u51c0\u548c\u540c\u6b65\uff0c\u6211\u4eec\u53ef\u4ee5\u91c7\u53d6\u4ee5\u4e0b\u51e0\u4e2a\u6b65\u9aa4\uff1a<\/p>\n

    \n
  1. \u63d0\u4ea4\u6240\u6709\u7684\u4ee3\u7801\u4fee\u6539
    \u5728\u8fdb\u884c\u4ee3\u7801\u5408\u5e76\u4e4b\u524d\uff0c\u786e\u4fdd\u5df2\u7ecf\u63d0\u4ea4\u4e86\u6240\u6709\u7684\u4ee3\u7801\u4fee\u6539\u5230\u672c\u5730\u4ed3\u5e93\u3002\u4f7f\u7528git add .\u5c06\u6240\u6709\u4fee\u6539\u7684\u6587\u4ef6\u6dfb\u52a0\u5230\u6682\u5b58\u533a\uff0c\u7136\u540e\u4f7f\u7528git commit -m “commit message”\u5c06\u6240\u6709\u4fee\u6539\u7684\u6587\u4ef6\u63d0\u4ea4\u5230\u672c\u5730\u4ed3\u5e93\u3002<\/li>\n
  2. \u66f4\u65b0\u4e3b\u5206\u652f
    \u4f7f\u7528git checkout main\u5207\u6362\u5230\u4e3b\u5206\u652f\uff0c\u7136\u540e\u4f7f\u7528git pull\u62c9\u53d6\u6700\u65b0\u7684\u4ee3\u7801\u4fee\u6539\u3002<\/li>\n
  3. \u5408\u5e76\u4e3b\u5206\u652f\u5230\u5f00\u53d1\u5206\u652f
    \u5207\u6362\u5230\u81ea\u5df1\u7684\u5f00\u53d1\u5206\u652f\uff0c\u4f7f\u7528git merge main\u5c06\u6700\u65b0\u7684\u4e3b\u5206\u652f\u4ee3\u7801\u5408\u5e76\u5230\u81ea\u5df1\u7684\u5f00\u53d1\u5206\u652f\u3002\u5982\u679c\u6709\u51b2\u7a81\u9700\u8981\u89e3\u51b3\uff0c\u53ef\u4ee5\u4f7f\u7528Git\u63d0\u4f9b\u7684\u5408\u5e76\u5de5\u5177\u6216\u8005\u624b\u52a8\u4fee\u6539\u51b2\u7a81\u4ee3\u7801\u3002<\/li>\n<\/ol>\n

    \u4e8c\u3001\u9009\u62e9\u5408\u9002\u7684\u5408\u5e76\u7b56\u7565<\/p>\n

    Git\u63d0\u4f9b\u4e86\u4e0d\u540c\u7684\u5408\u5e76\u7b56\u7565\uff0c\u7528\u4e8e\u5904\u7406\u4ee3\u7801\u5408\u5e76\u65f6\u7684\u51b2\u7a81\u3002\u5e38\u7528\u7684\u5408\u5e76\u7b56\u7565\u5305\u62ec\u4ee5\u4e0b\u51e0\u79cd\uff1a<\/p>\n

      \n
    1. \u5408\u5e76\u63d0\u4ea4
      \u8fd9\u662f\u6700\u5e38\u7528\u7684\u5408\u5e76\u7b56\u7565\uff0c\u4f7f\u7528git merge\u547d\u4ee4\u5c06\u5176\u4ed6\u5206\u652f\u7684\u4ee3\u7801\u5408\u5e76\u5230\u5f53\u524d\u5206\u652f\u3002\u8fd9\u79cd\u5408\u5e76\u7b56\u7565\u53ef\u4ee5\u4fdd\u7559\u539f\u59cb\u63d0\u4ea4\u7684\u5386\u53f2\u8bb0\u5f55\uff0c\u5e76\u4e14\u6bd4\u8f83\u7b80\u5355\u3002<\/li>\n
    2. \u53d8\u57fa
      \u53d8\u57fa\u662f\u5c06\u5f53\u524d\u5206\u652f\u7684\u63d0\u4ea4\u653e\u5728\u76ee\u6807\u5206\u652f\u7684\u6700\u65b0\u63d0\u4ea4\u4e4b\u540e\u7684\u4e00\u79cd\u5408\u5e76\u7b56\u7565\u3002\u4f7f\u7528git rebase\u547d\u4ee4\u53ef\u4ee5\u5c06\u5f53\u524d\u5206\u652f\u7684\u63d0\u4ea4\u53d8\u57fa\u5230\u76ee\u6807\u5206\u652f\u7684\u6700\u65b0\u63d0\u4ea4\u4e4b\u540e\u3002\u53d8\u57fa\u540e\u7684\u63d0\u4ea4\u5386\u53f2\u66f4\u52a0\u6574\u6d01\uff0c\u4f46\u662f\u4e5f\u4f1a\u6539\u53d8\u63d0\u4ea4\u7684\u987a\u5e8f\u3002<\/li>\n
    3. \u4e09\u65b9\u5408\u5e76
      \u4e09\u65b9\u5408\u5e76\u662f\u6307\u5c06\u76ee\u6807\u5206\u652f\u3001\u81ea\u5df1\u7684\u5206\u652f\u4ee5\u53ca\u4e00\u4e2a\u5171\u540c\u7684\u7956\u5148\u5206\u652f\u8fdb\u884c\u5408\u5e76\u7684\u4e00\u79cd\u5408\u5e76\u7b56\u7565\u3002\u4f7f\u7528git merge -s recursive\u53ef\u4ee5\u8fdb\u884c\u4e09\u65b9\u5408\u5e76\u3002\u8fd9\u79cd\u5408\u5e76\u7b56\u7565\u53ef\u4ee5\u540c\u65f6\u5904\u7406\u591a\u4e2a\u5206\u652f\u7684\u51b2\u7a81\uff0c\u4f46\u662f\u9700\u8981\u4fdd\u8bc1\u4ee3\u7801\u7684\u4e00\u81f4\u6027\u3002<\/li>\n<\/ol>\n

      \u9009\u62e9\u5408\u9002\u7684\u5408\u5e76\u7b56\u7565\u6839\u636e\u5177\u4f53\u7684\u9879\u76ee\u9700\u6c42\u548c\u5f00\u53d1\u573a\u666f\u8fdb\u884c\u9009\u62e9\u3002\u5728\u591a\u4eba\u534f\u4f5c\u5f00\u53d1\u7684\u9879\u76ee\u4e2d\uff0c\u901a\u5e38\u4f7f\u7528\u5408\u5e76\u63d0\u4ea4\u6216\u8005\u53d8\u57fa\u7684\u7b56\u7565\u3002<\/p>\n

      \u4e09\u3001\u89e3\u51b3\u4ee3\u7801\u51b2\u7a81<\/p>\n

      \u5728\u8fdb\u884c\u4ee3\u7801\u5408\u5e76\u7684\u8fc7\u7a0b\u4e2d\uff0c\u53ef\u80fd\u4f1a\u51fa\u73b0\u4ee3\u7801\u51b2\u7a81\u3002\u4ee3\u7801\u51b2\u7a81\u6307\u7684\u662f\u540c\u4e00\u90e8\u5206\u4ee3\u7801\u540c\u65f6\u88ab\u591a\u4e2a\u5206\u652f\u4fee\u6539\uff0cGit\u65e0\u6cd5\u786e\u5b9a\u8981\u4f7f\u7528\u54ea\u4e2a\u5206\u652f\u7684\u4ee3\u7801\u3002\u5f53\u51fa\u73b0\u4ee3\u7801\u51b2\u7a81\u65f6\uff0c\u6211\u4eec\u9700\u8981\u624b\u52a8\u89e3\u51b3\u51b2\u7a81\u3002<\/p>\n

      \u89e3\u51b3\u4ee3\u7801\u51b2\u7a81\u53ef\u4ee5\u91c7\u53d6\u4ee5\u4e0b\u51e0\u4e2a\u6b65\u9aa4\uff1a<\/p>\n

        \n
      1. \u4f7f\u7528git status\u547d\u4ee4\u67e5\u770b\u51b2\u7a81\u6587\u4ef6
        \u51b2\u7a81\u7684\u6587\u4ef6\u4f1a\u88ab\u6807\u8bb0\u4e3a\u672a\u5408\u5e76\uff0c\u4f7f\u7528git status\u53ef\u4ee5\u67e5\u770b\u51b2\u7a81\u7684\u6587\u4ef6\u5217\u8868\u3002<\/li>\n
      2. \u624b\u52a8\u89e3\u51b3\u4ee3\u7801\u51b2\u7a81
        \u6253\u5f00\u51b2\u7a81\u7684\u6587\u4ef6\uff0cGit\u4f1a\u7528>>>>>>\u6807\u8bb0\u51b2\u7a81\u7684\u4ee3\u7801\u5757\u3002\u6839\u636e\u5b9e\u9645\u60c5\u51b5\uff0c\u9009\u62e9\u4fdd\u7559\u9700\u8981\u7684\u4ee3\u7801\u5757\uff0c\u5220\u9664\u51b2\u7a81\u6807\u8bb0\uff0c\u5e76\u4e14\u4fee\u590d\u53ef\u80fd\u7531\u4e8e\u51b2\u7a81\u5f15\u5165\u7684Bug\u3002<\/li>\n
      3. \u4f7f\u7528git add\u547d\u4ee4\u6807\u8bb0\u51b2\u7a81\u5df2\u89e3\u51b3
        \u5728\u89e3\u51b3\u51b2\u7a81\u540e\uff0c\u4f7f\u7528git add\u547d\u4ee4\u5c06\u51b2\u7a81\u6587\u4ef6\u6807\u8bb0\u4e3a\u5df2\u89e3\u51b3\u3002<\/li>\n
      4. \u63d0\u4ea4\u89e3\u51b3\u540e\u7684\u4ee3\u7801
        \u4f7f\u7528git commit -m “resolve conflict”\u547d\u4ee4\u63d0\u4ea4\u89e3\u51b3\u51b2\u7a81\u540e\u7684\u4ee3\u7801\u3002<\/li>\n<\/ol>\n

        \u56db\u3001\u4f7f\u7528Pull Request\u8fdb\u884c\u4ee3\u7801\u5ba1\u67e5<\/p>\n

        \u5728\u5408\u5e76\u4ee3\u7801\u4e4b\u524d\uff0c\u4f7f\u7528Pull Request(Pull Reqeust)\u8fdb\u884c\u4ee3\u7801\u5ba1\u67e5\u662f\u4e00\u4e2a\u975e\u5e38\u597d\u7684\u5b9e\u8df5\u3002\u901a\u8fc7Pull Request\uff0c\u53ef\u4ee5\u8ba9\u5176\u4ed6\u5f00\u53d1\u8005\u5bf9\u4ee3\u7801\u8fdb\u884c\u5ba1\u6838\uff0c\u53d1\u73b0\u6f5c\u5728\u7684\u95ee\u9898\u548cbug\uff0c\u5e76\u7ed9\u51fa\u6539\u8fdb\u610f\u89c1\u3002<\/p>\n

        \u4f7f\u7528Pull Request\u8fdb\u884c\u4ee3\u7801\u5ba1\u67e5\u53ef\u4ee5\u91c7\u53d6\u4ee5\u4e0b\u51e0\u4e2a\u6b65\u9aa4\uff1a<\/p>\n

          \n
        1. \u5728\u4ee3\u7801\u5408\u5e76\u4e4b\u524d\uff0c\u5c06\u81ea\u5df1\u7684\u5f00\u53d1\u5206\u652f\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\u3002\u4f7f\u7528git push origin branch_name\u547d\u4ee4\u5c06\u672c\u5730\u5206\u652f\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\u3002<\/li>\n
        2. \u5728\u8fdc\u7a0b\u4ed3\u5e93\u4e2d\u521b\u5efa\u4e00\u4e2aPull Request\u3002\u901a\u8fc7\u8fdc\u7a0b\u4ed3\u5e93\u7684\u7f51\u9875\u754c\u9762\uff0c\u9009\u62e9\u81ea\u5df1\u7684\u5206\u652f\u548c\u76ee\u6807\u5206\u652f\uff0c\u521b\u5efa\u4e00\u4e2aPull Request\u3002<\/li>\n
        3. \u63d0\u9192\u5176\u4ed6\u5f00\u53d1\u8005\u8fdb\u884c\u4ee3\u7801\u5ba1\u67e5\u3002\u901a\u8fc7Pull Request\u754c\u9762\uff0c\u53ef\u4ee5\u5728\u8bc4\u8bba\u4e2d\u63d0\u9192\u5176\u4ed6\u5f00\u53d1\u8005\u8fdb\u884c\u4ee3\u7801\u5ba1\u67e5\u3002<\/li>\n
        4. \u6839\u636e\u5ba1\u67e5\u7ed3\u679c\u8fdb\u884c\u4fee\u6539\u3002\u6839\u636e\u5176\u4ed6\u5f00\u53d1\u8005\u7684\u5ba1\u67e5\u610f\u89c1\uff0c\u4fee\u6539\u4ee3\u7801\u5e76\u4e14\u63d0\u4ea4\u5230\u81ea\u5df1\u7684\u5206\u652f\u3002<\/li>\n
        5. \u5b8c\u6210\u4ee3\u7801\u5ba1\u67e5\u540e\uff0c\u53ef\u4ee5\u5c06\u4ee3\u7801\u5408\u5e76\u5230\u76ee\u6807\u5206\u652f\u3002\u901a\u8fc7Pull Request\u754c\u9762\uff0c\u70b9\u51fb\u5408\u5e76\u6309\u94ae\uff0c\u5c06\u4ee3\u7801\u5408\u5e76\u5230\u76ee\u6807\u5206\u652f\u3002<\/li>\n<\/ol>\n

          \u4ee5\u4e0a\u5c31\u662f\u4e00\u4e9bGit\u4ee3\u7801\u5408\u5e76\u7684\u6280\u5de7\u548c\u7ecf\u9a8c\u5206\u4eab\u3002\u901a\u8fc7\u4fdd\u6301\u5206\u652f\u7684\u5e72\u51c0\u548c\u540c\u6b65\u3001\u9009\u62e9\u5408\u9002\u7684\u5408\u5e76\u7b56\u7565\u3001\u89e3\u51b3\u4ee3\u7801\u51b2\u7a81\u548c\u4f7f\u7528Pull Request\u8fdb\u884c\u4ee3\u7801\u5ba1\u67e5\uff0c\u5f00\u53d1\u8005\u53ef\u4ee5\u66f4\u52a0\u9ad8\u6548\u5730\u8fdb\u884c\u4ee3\u7801\u5408\u5e76\uff0c\u786e\u4fdd\u9879\u76ee\u7684\u4ee3\u7801\u8d28\u91cf\u548c\u7a33\u5b9a\u6027\u3002\u5e0c\u671b\u8fd9\u4e9b\u7ecf\u9a8c\u5bf9\u5927\u5bb6\u6709\u6240\u5e2e\u52a9\u3002<\/p>\n

          \u4ee5\u4e0a\u5c31\u662fGit\u4ee3\u7801\u5408\u5e76\u6280\u5de7\uff1a\u9879\u76ee\u7ecf\u9a8c\u5206\u4eab\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":"

          Git\u4ee3\u7801\u5408\u5e76\u6280\u5de7\uff1a\u9879\u76ee\u7ecf\u9a8c\u5206\u4eab \u5728\u8f6f\u4ef6\u5f00\u53d1\u8fc7\u7a0b\u4e2d\uff0c\u4ee3\u7801\u5408\u5e76\u662f\u4e00\u4e2a\u975e\u5e38\u91cd\u8981\u7684\u73af\u8282\u3002\u7279\u522b\u662f\u5728\u591a\u4eba\u534f\u4f5c\u5f00\u53d1\u7684\u9879\u76ee\u4e2d\uff0c\u4e0d\u540c\u5f00\u53d1\u8005\u6240\u521b\u5efa\u7684\u5206\u652f\u9700\u8981\u8fdb\u884c\u5408\u5e76\uff0c\u4ee5\u786e\u4fdd\u4ee3\u7801\u7684\u5b8c\u6574\u6027\u548c\u4e00\u81f4\u6027\u3002\u672c\u6587\u5c06\u5206\u4eab\u4e00\u4e9bGit\u4ee3\u7801\u5408\u5e76\u7684\u6280\u5de7\u548c\u7ecf\u9a8c\uff0c\u5e2e\u52a9\u5f00\u53d1\u8005\u66f4\u52a0\u9ad8\u6548\u5730\u8fdb\u884c\u4ee3\u7801\u5408\u5e76\u3002 \u4e00\u3001\u4fdd\u6301\u5206\u652f\u7684\u5e72\u51c0\u548c\u540c\u6b65 \u5728\u8fdb\u884c\u4ee3\u7801\u5408\u5e76\u4e4b\u524d\uff0c\u9996\u5148\u8981\u786e\u4fdd\u81ea\u5df1\u7684\u5206\u652f\u662f\u5e72\u51c0\u548c\u540c\u6b65\u7684\u3002\u5e72\u51c0\u7684\u610f\u601d\u662f\u8be5\u5206\u652f\u4e0d\u5e94\u8be5\u5305\u542b\u4efb\u4f55\u672a\u63d0\u4ea4\u7684\u4ee3\u7801\u4fee\u6539\uff0c\u800c\u540c\u6b65\u7684\u610f\u601d\u662f\u5206\u652f\u5e94\u8be5\u57fa\u4e8e\u6700\u65b0\u7684\u4e3b\u5206\u652f\u8fdb\u884c\u5f00\u53d1\u3002 \u4e3a\u4e86\u4fdd\u6301\u5206\u652f\u7684\u5e72\u51c0\u548c\u540c\u6b65\uff0c\u6211\u4eec\u53ef\u4ee5\u91c7\u53d6\u4ee5\u4e0b\u51e0\u4e2a\u6b65\u9aa4\uff1a \u63d0\u4ea4\u6240\u6709\u7684\u4ee3\u7801\u4fee\u6539\u5728\u8fdb\u884c\u4ee3\u7801\u5408\u5e76\u4e4b\u524d\uff0c\u786e\u4fdd\u5df2\u7ecf\u63d0\u4ea4\u4e86\u6240\u6709\u7684\u4ee3\u7801\u4fee\u6539\u5230\u672c\u5730\u4ed3\u5e93\u3002\u4f7f\u7528git add .\u5c06\u6240\u6709\u4fee\u6539\u7684\u6587\u4ef6\u6dfb\u52a0\u5230\u6682\u5b58\u533a\uff0c\u7136\u540e\u4f7f\u7528git commit -m “commit message”\u5c06\u6240\u6709\u4fee\u6539\u7684\u6587\u4ef6\u63d0\u4ea4\u5230\u672c\u5730\u4ed3\u5e93\u3002 \u66f4\u65b0\u4e3b\u5206\u652f\u4f7f\u7528git checkout main\u5207\u6362\u5230\u4e3b\u5206\u652f\uff0c\u7136\u540e\u4f7f\u7528git pull\u62c9\u53d6\u6700\u65b0\u7684\u4ee3\u7801\u4fee\u6539\u3002 \u5408\u5e76\u4e3b\u5206\u652f\u5230\u5f00\u53d1\u5206\u652f\u5207\u6362\u5230\u81ea\u5df1\u7684\u5f00\u53d1\u5206\u652f\uff0c\u4f7f\u7528git merge main\u5c06\u6700\u65b0\u7684\u4e3b\u5206\u652f\u4ee3\u7801\u5408\u5e76\u5230\u81ea\u5df1\u7684\u5f00\u53d1\u5206\u652f\u3002\u5982\u679c\u6709\u51b2\u7a81\u9700\u8981\u89e3\u51b3\uff0c\u53ef\u4ee5\u4f7f\u7528Git\u63d0\u4f9b\u7684\u5408\u5e76\u5de5\u5177\u6216\u8005\u624b\u52a8\u4fee\u6539\u51b2\u7a81\u4ee3\u7801\u3002 \u4e8c\u3001\u9009\u62e9\u5408\u9002\u7684\u5408\u5e76\u7b56\u7565 Git\u63d0\u4f9b\u4e86\u4e0d\u540c\u7684\u5408\u5e76\u7b56\u7565\uff0c\u7528\u4e8e\u5904\u7406\u4ee3\u7801\u5408\u5e76\u65f6\u7684\u51b2\u7a81\u3002\u5e38\u7528\u7684\u5408\u5e76\u7b56\u7565\u5305\u62ec\u4ee5\u4e0b\u51e0\u79cd\uff1a \u5408\u5e76\u63d0\u4ea4\u8fd9\u662f\u6700\u5e38\u7528\u7684\u5408\u5e76\u7b56\u7565\uff0c\u4f7f\u7528git merge\u547d\u4ee4\u5c06\u5176\u4ed6\u5206\u652f\u7684\u4ee3\u7801\u5408\u5e76\u5230\u5f53\u524d\u5206\u652f\u3002\u8fd9\u79cd\u5408\u5e76\u7b56\u7565\u53ef\u4ee5\u4fdd\u7559\u539f\u59cb\u63d0\u4ea4\u7684\u5386\u53f2\u8bb0\u5f55\uff0c\u5e76\u4e14\u6bd4\u8f83\u7b80\u5355\u3002 \u53d8\u57fa\u53d8\u57fa\u662f\u5c06\u5f53\u524d\u5206\u652f\u7684\u63d0\u4ea4\u653e\u5728\u76ee\u6807\u5206\u652f\u7684\u6700\u65b0\u63d0\u4ea4\u4e4b\u540e\u7684\u4e00\u79cd\u5408\u5e76\u7b56\u7565\u3002\u4f7f\u7528git rebase\u547d\u4ee4\u53ef\u4ee5\u5c06\u5f53\u524d\u5206\u652f\u7684\u63d0\u4ea4\u53d8\u57fa\u5230\u76ee\u6807\u5206\u652f\u7684\u6700\u65b0\u63d0\u4ea4\u4e4b\u540e\u3002\u53d8\u57fa\u540e\u7684\u63d0\u4ea4\u5386\u53f2\u66f4\u52a0\u6574\u6d01\uff0c\u4f46\u662f\u4e5f\u4f1a\u6539\u53d8\u63d0\u4ea4\u7684\u987a\u5e8f\u3002 \u4e09\u65b9\u5408\u5e76\u4e09\u65b9\u5408\u5e76\u662f\u6307\u5c06\u76ee\u6807\u5206\u652f\u3001\u81ea\u5df1\u7684\u5206\u652f\u4ee5\u53ca\u4e00\u4e2a\u5171\u540c\u7684\u7956\u5148\u5206\u652f\u8fdb\u884c\u5408\u5e76\u7684\u4e00\u79cd\u5408\u5e76\u7b56\u7565\u3002\u4f7f\u7528git merge -s recursive\u53ef\u4ee5\u8fdb\u884c\u4e09\u65b9\u5408\u5e76\u3002\u8fd9\u79cd\u5408\u5e76\u7b56\u7565\u53ef\u4ee5\u540c\u65f6\u5904\u7406\u591a\u4e2a\u5206\u652f\u7684\u51b2\u7a81\uff0c\u4f46\u662f\u9700\u8981\u4fdd\u8bc1\u4ee3\u7801\u7684\u4e00\u81f4\u6027\u3002 \u9009\u62e9\u5408\u9002\u7684\u5408\u5e76\u7b56\u7565\u6839\u636e\u5177\u4f53\u7684\u9879\u76ee\u9700\u6c42\u548c\u5f00\u53d1\u573a\u666f\u8fdb\u884c\u9009\u62e9\u3002\u5728\u591a\u4eba\u534f\u4f5c\u5f00\u53d1\u7684\u9879\u76ee\u4e2d\uff0c\u901a\u5e38\u4f7f\u7528\u5408\u5e76\u63d0\u4ea4\u6216\u8005\u53d8\u57fa\u7684\u7b56\u7565\u3002 \u4e09\u3001\u89e3\u51b3\u4ee3\u7801\u51b2\u7a81 \u5728\u8fdb\u884c\u4ee3\u7801\u5408\u5e76\u7684\u8fc7\u7a0b\u4e2d\uff0c\u53ef\u80fd\u4f1a\u51fa\u73b0\u4ee3\u7801\u51b2\u7a81\u3002\u4ee3\u7801\u51b2\u7a81\u6307\u7684\u662f\u540c\u4e00\u90e8\u5206\u4ee3\u7801\u540c\u65f6\u88ab\u591a\u4e2a\u5206\u652f\u4fee\u6539\uff0cGit\u65e0\u6cd5\u786e\u5b9a\u8981\u4f7f\u7528\u54ea\u4e2a\u5206\u652f\u7684\u4ee3\u7801\u3002\u5f53\u51fa\u73b0\u4ee3\u7801\u51b2\u7a81\u65f6\uff0c\u6211\u4eec\u9700\u8981\u624b\u52a8\u89e3\u51b3\u51b2\u7a81\u3002 \u89e3\u51b3\u4ee3\u7801\u51b2\u7a81\u53ef\u4ee5\u91c7\u53d6\u4ee5\u4e0b\u51e0\u4e2a\u6b65\u9aa4\uff1a \u4f7f\u7528git status\u547d\u4ee4\u67e5\u770b\u51b2\u7a81\u6587\u4ef6\u51b2\u7a81\u7684\u6587\u4ef6\u4f1a\u88ab\u6807\u8bb0\u4e3a\u672a\u5408\u5e76\uff0c\u4f7f\u7528git status\u53ef\u4ee5\u67e5\u770b\u51b2\u7a81\u7684\u6587\u4ef6\u5217\u8868\u3002 \u624b\u52a8\u89e3\u51b3\u4ee3\u7801\u51b2\u7a81\u6253\u5f00\u51b2\u7a81\u7684\u6587\u4ef6\uff0cGit\u4f1a\u7528>>>>>>\u6807\u8bb0\u51b2\u7a81\u7684\u4ee3\u7801\u5757\u3002\u6839\u636e\u5b9e\u9645\u60c5\u51b5\uff0c\u9009\u62e9\u4fdd\u7559\u9700\u8981\u7684\u4ee3\u7801\u5757\uff0c\u5220\u9664\u51b2\u7a81\u6807\u8bb0\uff0c\u5e76\u4e14\u4fee\u590d\u53ef\u80fd\u7531\u4e8e\u51b2\u7a81\u5f15\u5165\u7684Bug\u3002 \u4f7f\u7528git add\u547d\u4ee4\u6807\u8bb0\u51b2\u7a81\u5df2\u89e3\u51b3\u5728\u89e3\u51b3\u51b2\u7a81\u540e\uff0c\u4f7f\u7528git add\u547d\u4ee4\u5c06\u51b2\u7a81\u6587\u4ef6\u6807\u8bb0\u4e3a\u5df2\u89e3\u51b3\u3002 \u63d0\u4ea4\u89e3\u51b3\u540e\u7684\u4ee3\u7801\u4f7f\u7528git commit -m “resolve conflict”\u547d\u4ee4\u63d0\u4ea4\u89e3\u51b3\u51b2\u7a81\u540e\u7684\u4ee3\u7801\u3002 \u56db\u3001\u4f7f\u7528Pull Request\u8fdb\u884c\u4ee3\u7801\u5ba1\u67e5 \u5728\u5408\u5e76\u4ee3\u7801\u4e4b\u524d\uff0c\u4f7f\u7528Pull Request(Pull Reqeust)\u8fdb\u884c\u4ee3\u7801\u5ba1\u67e5\u662f\u4e00\u4e2a\u975e\u5e38\u597d\u7684\u5b9e\u8df5\u3002\u901a\u8fc7Pull Request\uff0c\u53ef\u4ee5\u8ba9\u5176\u4ed6\u5f00\u53d1\u8005\u5bf9\u4ee3\u7801\u8fdb\u884c\u5ba1\u6838\uff0c\u53d1\u73b0\u6f5c\u5728\u7684\u95ee\u9898\u548cbug\uff0c\u5e76\u7ed9\u51fa\u6539\u8fdb\u610f\u89c1\u3002 \u4f7f\u7528Pull Request\u8fdb\u884c\u4ee3\u7801\u5ba1\u67e5\u53ef\u4ee5\u91c7\u53d6\u4ee5\u4e0b\u51e0\u4e2a\u6b65\u9aa4\uff1a \u5728\u4ee3\u7801\u5408\u5e76\u4e4b\u524d\uff0c\u5c06\u81ea\u5df1\u7684\u5f00\u53d1\u5206\u652f\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\u3002\u4f7f\u7528git push […]<\/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-20451","post","type-post","status-publish","format-standard","hentry","category-16"],"_links":{"self":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/20451","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=20451"}],"version-history":[{"count":0,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/20451\/revisions"}],"wp:attachment":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/media?parent=20451"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/categories?post=20451"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/tags?post=20451"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}