{"id":482,"date":"2023-05-07T10:07:37","date_gmt":"2023-05-07T02:07:37","guid":{"rendered":"https:\/\/zhaocunwei.co.uk\/?p=482"},"modified":"2023-05-07T11:42:09","modified_gmt":"2023-05-07T03:42:09","slug":"git-merge","status":"publish","type":"post","link":"https:\/\/zhaocunwei.co.uk\/index.php\/2023\/05\/07\/git-merge\/","title":{"rendered":"\u4f7f\u7528git\u8fd9\u4e48\u4e45\uff0c\u7279\u522b\u662f\u5bf9\uff1agit merge \u4e0e git rebase \u547d\u4ee4\u4e00\u76f4\u6ca1\u6709\u8be6\u7ec6\u7684\u8fdb\u884c\u603b\u7ed3\uff0c\u5199\u8fd9\u7bc7\u6587\u7ae0\uff0c\u5e0c\u671b\u80fd\u5e2e\u52a9\u5927\u5bb6\u80fd\u660e\u767d\u8fd9\u4e24\u4e2a\u6307\u4ee4\u7684\u533a\u522b\u548c\u5e94\u7528\u573a\u666f\uff0c\u611f\u8c22\u54c8\u54c8"},"content":{"rendered":"

\u524d\u8a00<\/h1>\n

\u4f7f\u7528git\u8fd9\u4e48\u4e45\uff0c\u7279\u522b\u662f\u5bf9\uff1agit merge \u4e0e git rebase \u547d\u4ee4\u4e00\u76f4\u6ca1\u6709\u8be6\u7ec6\u7684\u8fdb\u884c\u603b\u7ed3\uff0c\u5199\u8fd9\u7bc7\u6587\u7ae0\uff0c\u5e0c\u671b\u80fd\u5e2e\u52a9\u5927\u5bb6\u80fd\u660e\u767d\u8fd9\u4e24\u4e2a\u6307\u4ee4\u7684\u533a\u522b\u548c\u5e94\u7528\u573a\u666f\uff0c\u611f\u8c22\u54c8\u54c8<\/p>\n

Use git for so long, especially for git merge and git rebase command has not been detailed summary, write this article, hope to help you understand the difference between these two instructions and application scenarios, thank you ha ha<\/p>\n

O(\u2229_\u2229)O\u54c8\u54c8~<\/h1>\n

\u9996\u5148\u6211\u60f3\u8bf4\u7684git merge \u548c git rebase \u90fd\u662f\u7528\u4e8e\u5408\u5e76\u5206\u652f\u7684\u547d\u4ee4,\u4f46\u662f\u5b83\u4eec\u7684\u5b9e\u73b0\u65b9\u5f0f\u4e0d\u540c:<\/p>\n

git merge \u91c7\u7528\u4e09\u65b9\u5408\u5e76\u7b56\u7565\uff1a<\/p>\n

\u4f1a\u5728\u4e3b\u5206\u652f\u4e0a\u521b\u5efa\u4e00\u4e2a\u65b0\u63d0\u4ea4\u6765\u5408\u5e76\u5206\u652f\u4e0a\u7684\u4fee\u6539\u3002<\/p>\n

\u8fd9\u4e2a\u65b0\u7684\u63d0\u4ea4\u4f1a\u6709\u4e24\u4e2a\u7236\u63d0\u4ea4,\u5206\u522b\u662f\u4e3b\u5206\u652f\u4e0a\u7684\u6700\u540e\u4e00\u4e2a\u63d0\u4ea4\u548c FEATURE \u5206\u652f\u4e0a\u7684\u6700\u540e\u4e00\u4e2a\u63d0\u4ea4\u3002<\/p>\n

\u5212\u91cd\u70b9\ud83d\ude00<\/font><\/p>\n

git merge\u5de5\u4f5c\u539f\u7406\u4e3b\u8981\u5305\u542b\u4ee5\u4e0b\u51e0\u4e2a\u6b65\u9aa4:<\/p>\n

    \n
  1. \n

    \u67e5\u627e\u6700\u65b0\u516c\u5171\u7956\u5148(common ancestor)\u63d0\u4ea4\u3002\u8fd9\u662f\u8981\u5408\u5e76\u7684\u4e24\u4e2a\u5206\u652f\u7684\u6700\u65b0\u7684\u5171\u540c\u7956\u5148\u63d0\u4ea4\u3002<\/p>\n<\/li>\n

  2. \n

    \u5bf9\u6bd4\u516c\u5171\u7956\u5148\u540e\u7684\u4fee\u6539\u3002\u6bd4\u8f83\u516c\u5171\u7956\u5148\u540e\u7684\u4e24\u4e2a\u5206\u652f\u4e0a\u7684\u4fee\u6539,\u4ee5\u751f\u6210\u4e00\u4e2a\u5305\u542b\u4e24\u4e2a\u5206\u652f\u6240\u6709\u4fee\u6539\u7684\u7d22\u5f15(index)\u548c\u5de5\u4f5c\u6811(working tree)\u3002<\/p>\n<\/li>\n

  3. \n

    \u68c0\u67e5\u662f\u5426\u6709\u51b2\u7a81\u3002\u5982\u679c\u5bf9\u540c\u4e00\u4e2a\u6587\u4ef6\u7684\u540c\u4e00\u4e2a\u90e8\u5206\u505a\u4e86\u4e0d\u540c\u7684\u4fee\u6539,Git\u65e0\u6cd5 gut merge,\u9700\u8981\u4eba\u5de5\u89e3\u51b3\u51b2\u7a81\u540e\u518d\u63d0\u4ea4\u3002<\/p>\n<\/li>\n

  4. \n

    \u521b\u5efa\u65b0\u7684\u5408\u5e76\u63d0\u4ea4(merge commit)\u3002\u5c06\u6b65\u9aa42\u751f\u6210\u7684\u7ed3\u679c\u63d0\u4ea4,\u521b\u5efa\u4e00\u4e2a\u65b0\u7684\u63d0\u4ea4\u3002\u6b64\u63d0\u4ea4\u4f1a\u6307\u5411\u8981\u5408\u5e76\u7684\u4e24\u4e2a\u5206\u652f\u3002<\/p>\n<\/li>\n

  5. \n

    \u5c06\u5206\u652f\u6307\u9488\u79fb\u52a8\u5230\u65b0\u63d0\u4ea4\u3002\u5c06\u5f53\u524d\u5206\u652f(\u901a\u5e38\u4e3a\u4e3b\u5206\u652f)\u6307\u5411\u65b0\u521b\u5efa\u7684\u5408\u5e76\u63d0\u4ea4\u3002<\/p>\n<\/li>\n

  6. \n

    \u5220\u9664\u65e0\u6548\u5206\u652f(\u53ef\u9009)\u3002\u5982\u679c\u5408\u5e76\u5206\u652f\u4e0d\u518d\u9700\u8981,\u53ef\u4ee5\u9009\u62e9\u5220\u9664\u3002<\/p>\n

    \u4e00\u4e2a\u793a\u4f8b\u8fc7\u7a0b:<\/p>\n

    master \u5206\u652f:A-B-C
    \nfeature \u5206\u652f:A-D-E1. \u516c\u5171\u7956\u5148\u4e3a A \u63d0\u4ea4<\/p>\n<\/li>\n<\/ol>\n

    \u200b feature \u5206\u652f\u7684 D \u548c E \u63d0\u4ea4\u4e0e master \u5206\u652f\u7684 B \u548c C \u63d0\u4ea4\u5747\u5c5e\u65b0\u4fee\u6539<\/p>\n

    \u200b \u65e0\u51b2\u7a81,\u53ef\u4ee5\u76f4\u63a5\u5408\u5e76<\/p>\n

    \u200b \u521b\u5efa\u65b0\u63d0\u4ea4 F,F \u7684\u7236\u63d0\u4ea4\u4e3a B \u548c E<\/p>\n

    \u200b master \u5206\u652f\u6307\u9488\u79fb\u52a8\u5230\u63d0\u4ea4 F<\/p>\n

    \u200b \u5220\u9664 feature \u5206\u652f(\u53ef\u9009)\u6700\u7ec8 master \u5206\u652f\u7684\u63d0\u4ea4\u5386\u53f2\u4e3a:<\/p>\n

    \u200b A-B-F\u53ef\u4ee5\u770b\u5230,<\/p>\n

    \u901a\u8fc7\ud83d\udc46\u7684\u6848\u4f8b\u6211\u4eec\u7ec8\u4e8e\u660e\u767d\u4e86\uff1agit merge \u786e\u5b9e\u662f\u91c7\u7528\u4e86\u4e09\u65b9\u5408\u5e76\u7b56\u7565,\u5c06\u4e24\u4e2a\u5206\u652f\u4e0a\u7684\u4fee\u6539\u5408\u5e76\u5230\u4e00\u4e2a\u65b0\u63d0\u4ea4\u4e2d,\u5e76\u5c06\u4e3b\u5206\u652f\u6307\u5411\u8fd9\u4e2a\u65b0\u63d0\u4ea4,\u5b9e\u73b0\u5206\u652f\u5408\u5e76\u3002<\/p>\n

    \ud83d\ude00\u8fd9\u79cd\u5408\u5e76\u65b9\u5f0f\u6700\u5927\u7684\u597d\u5904\u5728\u4e8e\u7ef4\u6301\u4e86\u5206\u652f\u7684\u63d0\u4ea4\u5386\u53f2,\u6bcf\u4e2a\u5206\u652f\u7684\u5f00\u53d1\u8fc7\u7a0b\u90fd\u5728\u63d0\u4ea4\u5386\u53f2\u4e2d\u5f97\u5230\u4e86\u4fdd\u7559\u3002\u4f46\u662f,\u5206\u652f\u5408\u5e76\u6b21\u6570\u591a\u4e86\u4e4b\u540e,\u63d0\u4ea4\u5386\u53f2\u4f1a\u663e\u5f97\u5f88\u4e71,\u8fd9\u65f6\u53ef\u4ee5\u8003\u8651\u4f7f\u7528 git rebase \u7b56\u7565\u8fdb\u884c\u53d8\u57fa,\u4ee5\u4fbf\u7406\u6e05\u63d0\u4ea4\u5386\u53f2\u3002<\/p>\n

    git rebase \u4f1a\u5c06FEATURE\u5206\u652f\u4e0a\u7684\u6bcf\u4e2a\u63d0\u4ea4(commit)\u53d6\u6d88\u6389,\u5e76\u4e14\u628a\u4fee\u6539\u5e94\u7528\u5230\u4e3b\u5206\u652f\u4e0a,\u4f7f\u4e4b\u770b\u8d77\u6765\u5c31\u50cf\u8fd9\u4e9b\u4fee\u6539\u662f\u5728\u4e3b\u5206\u652f\u4e0a\u5b8c\u6210\u7684\u4e00\u6837\u3002<\/p>\n

    \u8fd9\u4e2a\u8fc7\u7a0b\u4e2d\u4e0d\u4f1a\u521b\u5efa\u65b0\u7684\u63d0\u4ea4,\u672c\u5730\u7684\u6539\u53d8\u90fd\u662f\u5728 Feature \u5206\u652f\u4e0a\u7684\u63d0\u4ea4\u4e0a\u5b8c\u6210\u7684,\u53ea\u662f\u5c06\u8fd9\u4e9b\u63d0\u4ea4\u79fb\u5230\u4e3b\u5206\u652f\u4e0a\u7684\u5bf9\u5e94\u4f4d\u7f6e\u3002<\/p>\n

    git rebase \u5de5\u4f5c\u539f\u7406\u4e3b\u8981\u662f:<\/font><\/p>\n

    \u5c06\u4e00\u4e2a\u5206\u652f\u4e0a\u7684\u63d0\u4ea4(commit)\u53d6\u6d88,\u5e76\u628a\u4fee\u6539\u5e94\u7528\u5230\u53e6\u4e00\u4e2a\u5206\u652f\u4e0a,\u4f7f\u4e4b\u770b\u8d77\u6765\u50cf\u8fd9\u4e9b\u4fee\u6539\u662f\u5728\u8be5\u5206\u652f\u4e0a\u5b8c\u6210\u7684\u4e00\u6837\u3002<\/p>\n

    \u8fd9\u662f\u901a\u8fc7\u4ee5\u4e0b\u51e0\u4e2a\u6b65\u9aa4\u5b9e\u73b0\u7684:<\/p>\n

      \n
    1. \n

      \u627e\u5230\u5f53\u524d\u5206\u652f\u548c\u76ee\u6807\u5206\u652f(\u901a\u5e38\u662f\u4e3b\u5206\u652f)\u7684\u6700\u65b0\u516c\u5171\u7956\u5148\u63d0\u4ea4\u3002<\/p>\n<\/li>\n

    2. \n

      \u4ece\u5f53\u524d\u5206\u652f\u53d6\u51fa\u81ea\u516c\u5171\u7956\u5148\u4e4b\u540e\u7684\u63d0\u4ea4,\u6682\u5b58\u5728\u4e00\u4e2a\u4e34\u65f6\u533a\u57df\u3002<\/p>\n<\/li>\n

    3. \n

      \u76ee\u6807\u5206\u652f\u7684\u6307\u9488\u79fb\u52a8\u5230\u516c\u5171\u7956\u5148\u63d0\u4ea4\u3002<\/p>\n<\/li>\n

    4. \n

      \u4e00\u4e2a\u4e00\u4e2a\u5730\u53d6\u51fa\u6682\u5b58\u533a\u57df\u7684\u63d0\u4ea4,\u5728\u76ee\u6807\u5206\u652f\u4e0a\u91cd\u590d\u4e00\u6b21,\u76f4\u5230\u6240\u6709\u63d0\u4ea4\u90fd\u53d8\u57fa\u5b8c\u6210\u3002<\/p>\n<\/li>\n

    5. \n

      \u5220\u9664\u5f53\u524d\u5206\u652f\u3002<\/p>\n

      \u4e00\u4e2a\u793a\u4f8b:master:A-B-C
      \nfeature:A-D-E1. \u516c\u5171\u7956\u5148A<\/p>\n<\/li>\n<\/ol>\n

      \u200b \u6682\u5b58D\u548cE\u63d0\u4ea4<\/p>\n

      \u200b master\u6307\u9488\u79fb\u52a8\u5230A<\/p>\n

      \u200b \u5728master\u4e0a\u91cd\u590dD\u548cE\u63d0\u4ea4<\/p>\n

      \u200b \u5220\u9664feature\u5206\u652f\u6700\u540emaster\u7684\u63d0\u4ea4\u5386\u53f2\u4e3a:<\/p>\n

      \u200b A-D-E\u53ef\u4ee5\u770b\u51fa,git rebase \u4f1a\u91cd\u5199\u63d0\u4ea4\u5386\u53f2,\u5c06feature\u5206\u652f\u7684\u63d0\u4ea4\u53d8\u6210\u5728master\u5206\u652f\u4e0a\u7684\u63d0\u4ea4,<\/p>\n

      \u200b \u5e76\u5220\u9664feature\u5206\u652f\u3002<\/p>\n

      \u8fd9\u4f7f\u5f97\u63d0\u4ea4\u5386\u53f2\u53d8\u5f97\u5f88\u6e05\u6670\u7b80\u6d01\u3002<\/p>\n

      \u5728\u5de5\u4f5c\u4e2d,\u5e38\u7528git rebase\u7684\u547d\u4ee4\u6709:<\/p>\n

        \n
      • git rebase master feature<\/code>:\u5c06feature\u5206\u652f\u53d8\u57fa\u5230master\u5206\u652f\u4e0a\u3002<\/li>\n
      • git rebase -i master~5 master<\/code>:\u4ea4\u4e92\u5f0f\u53d8\u57fa,\u5c06\u6700\u8fd15\u6761\u63d0\u4ea4\u538b\u7f29\u4e3a\u4e00\u6761\u63d0\u4ea4\u3002\u53ef\u4ee5\u7f16\u8f91\u3001\u5220\u9664\u3001\u91cd\u6392\u3001\u5408\u5e76\u63d0\u4ea4\u3002<\/li>\n
      • git rebase --onto master server client<\/code>:\u5c06client\u5206\u652f\u53d8\u57fa\u5230master\u5206\u652f\u4e0a,\u800c\u4e0d\u53d8\u57faserver\u5206\u652f\u7684\u4fee\u6539\u3002<\/li>\n
      • git rebase --abort<\/code>:\u53d6\u6d88\u5f53\u524d\u53d8\u57fa\u64cd\u4f5c,\u5206\u652f\u4f1a\u6062\u590d\u5230\u53d8\u57fa\u524d\u7684\u72b6\u6001\u3002git rebase \u9700\u8981\u8c28\u614e\u4f7f\u7528,\u56e0\u4e3a\u5b83\u4f1a\u91cd\u5199\u63d0\u4ea4\u5386\u53f2,\u53ef\u80fd\u4f1a\u5f15\u8d77\u5206\u652f\u4e0e\u8fdc\u7a0b\u4ed3\u5e93\u7684\u5386\u53f2\u4e0d\u5339\u914d\u7684\u95ee\u9898\u3002\u4e00\u822c\u6211\u4eec\u4f1a\u5c06\u53d8\u57fa\u64cd\u4f5c\u4fdd\u7559\u5728\u672c\u5730,\u4e0d\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\u3002<\/li>\n<\/ul>\n

        \u603b\u7ed3\u4e00\u4e0b\u533a\u522b:<\/p>\n

          \n
        • \n

          git merge \u4f1a\u521b\u5efa\u65b0\u7684\u5408\u5e76\u63d0\u4ea4,git rebase \u4e0d\u4f1a\u521b\u5efa\u65b0\u7684\u63d0\u4ea4,\u53ea\u662f\u5c06\u63d0\u4ea4\u4ece\u4e00\u4e2a\u5206\u652f\u79fb\u5230\u53e6\u4e00\u4e2a\u5206\u652f\u3002<\/p>\n<\/li>\n

        • \n

          git merge \u4f1a\u5728\u4e3b\u5206\u652f\u4e0a\u751f\u6210\u4e00\u6761\u5408\u5e76\u5206\u652f\u7684\u8bb0\u5f55,git rebase \u770b\u4e0a\u53bb\u50cf\u5206\u652f\u4e0a\u7684\u6240\u6709\u4fee\u6539\u90fd\u5728\u4e3b\u5206\u652f\u4e0a\u5b8c\u6210\u7684,\u65e0\u5408\u5e76\u8bb0\u5f55\u3002<\/p>\n<\/li>\n

        • \n

          git merge \u6bcf\u6b21\u5408\u5e76\u5206\u652f\u65f6\u90fd\u4f1a\u5bf9\u540c\u4e00\u4e2a\u5206\u652f\u505a\u4e00\u6b21\u6574\u4f53\u5408\u5e76,git rebase \u53ef\u4ee5\u5206\u6279\u9010\u6761\u4fee\u6539\u5408\u5e76\u3002<\/p>\n<\/li>\n

        • \n

          git merge \u57fa\u672c\u4e0d\u4f1a\u6539\u53d8\u5206\u652f\u7684\u63d0\u4ea4\u5386\u53f2,git rebase \u4f1a\u91cd\u5199\u5386\u53f2\u3002<\/p>\n

          \u56e0\u6b64,\u4e00\u822c\u6765\u8bf4:<\/p>\n

          \u7528\u4e8e\u5c06\u5206\u652f\u5408\u5e76\u5230\u4e3b\u5206\u652f\u65f6\u4f7f\u7528 git merge \u66f4\u52a0\u9002\u5408\u3002<\/p>\n

          \u7528\u4e8e\u4e3a\u63d0\u4ea4\u538b\u7f29\u5206\u652f\u5386\u53f2\u6216\u5c06\u4e3b\u9898\u5206\u652f\u8c03\u6574\u5230\u4e3b\u5206\u652f\u7684\u6700\u65b0\u72b6\u6001\u65f6\u4f7f\u7528 git rebase \u66f4\u52a0\u5408\u9002\u3002<\/p>\n<\/li>\n<\/ul>\n","protected":false},"excerpt":{"rendered":"

          \u524d\u8a00 \u4f7f\u7528git\u8fd9\u4e48\u4e45\uff0c\u7279\u522b\u662f\u5bf9\uff1agit merge \u4e0e git rebase \u547d\u4ee4\u4e00\u76f4\u6ca1\u6709\u8be6\u7ec6\u7684\u8fdb\u884c\u603b\u7ed3\uff0c\u5199 […]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"om_disable_all_campaigns":false,"_mi_skip_tracking":false},"categories":[1],"tags":[],"aioseo_notices":[],"yoast_head":"\n\u4f7f\u7528git\u8fd9\u4e48\u4e45\uff0c\u7279\u522b\u662f\u5bf9\uff1agit merge \u4e0e git rebase \u547d\u4ee4\u4e00\u76f4\u6ca1\u6709\u8be6\u7ec6\u7684\u8fdb\u884c\u603b\u7ed3\uff0c\u5199\u8fd9\u7bc7\u6587\u7ae0\uff0c\u5e0c\u671b\u80fd\u5e2e\u52a9\u5927\u5bb6\u80fd\u660e\u767d\u8fd9\u4e24\u4e2a\u6307\u4ee4\u7684\u533a\u522b\u548c\u5e94\u7528\u573a\u666f\uff0c\u611f\u8c22\u54c8\u54c8 - \u672c\u7f51\u7ad9\u5206\u4eab\u7f16\u7a0b\u8fc7\u7a0b\u4e2d\u51fa\u73b0\u7684bug<\/title>\n<meta name=\"description\" content=\"\u4f7f\u7528git\u8fd9\u4e48\u4e45\uff0c\u7279\u522b\u662f\u5bf9\uff1agit merge \u4e0e git rebase \u547d\u4ee4\u4e00\u76f4\u6ca1\u6709\u8be6\u7ec6\u7684\u8fdb\u884c\u603b\u7ed3\uff0c\u5199\u8fd9\u7bc7\u6587\u7ae0\uff0c\u5e0c\u671b\u80fd\u5e2e\u52a9\u5927\u5bb6\u80fd\u660e\u767d\u8fd9\u4e24\u4e2a\u6307\u4ee4\u7684\u533a\u522b\u548c\u5e94\u7528\u573a\u666f\uff0c\u611f\u8c22\u54c8\u54c8\" \/>\n<meta name=\"robots\" content=\"index, follow, max-snippet:-1, max-image-preview:large, max-video-preview:-1\" \/>\n<link rel=\"canonical\" href=\"https:\/\/zhaocunwei.co.uk\/index.php\/2023\/05\/07\/git-merge\/\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"\u4f7f\u7528git\u8fd9\u4e48\u4e45\uff0c\u7279\u522b\u662f\u5bf9\uff1agit merge \u4e0e git rebase \u547d\u4ee4\u4e00\u76f4\u6ca1\u6709\u8be6\u7ec6\u7684\u8fdb\u884c\u603b\u7ed3\uff0c\u5199\u8fd9\u7bc7\u6587\u7ae0\uff0c\u5e0c\u671b\u80fd\u5e2e\u52a9\u5927\u5bb6\u80fd\u660e\u767d\u8fd9\u4e24\u4e2a\u6307\u4ee4\u7684\u533a\u522b\u548c\u5e94\u7528\u573a\u666f\uff0c\u611f\u8c22\u54c8\u54c8 - \u672c\u7f51\u7ad9\u5206\u4eab\u7f16\u7a0b\u8fc7\u7a0b\u4e2d\u51fa\u73b0\u7684bug\" \/>\n<meta property=\"og:description\" content=\"\u4f7f\u7528git\u8fd9\u4e48\u4e45\uff0c\u7279\u522b\u662f\u5bf9\uff1agit merge \u4e0e git rebase \u547d\u4ee4\u4e00\u76f4\u6ca1\u6709\u8be6\u7ec6\u7684\u8fdb\u884c\u603b\u7ed3\uff0c\u5199\u8fd9\u7bc7\u6587\u7ae0\uff0c\u5e0c\u671b\u80fd\u5e2e\u52a9\u5927\u5bb6\u80fd\u660e\u767d\u8fd9\u4e24\u4e2a\u6307\u4ee4\u7684\u533a\u522b\u548c\u5e94\u7528\u573a\u666f\uff0c\u611f\u8c22\u54c8\u54c8\" \/>\n<meta property=\"og:url\" content=\"https:\/\/zhaocunwei.co.uk\/index.php\/2023\/05\/07\/git-merge\/\" \/>\n<meta property=\"og:site_name\" content=\"\u672c\u7f51\u7ad9\u5206\u4eab\u7f16\u7a0b\u8fc7\u7a0b\u4e2d\u51fa\u73b0\u7684bug\" \/>\n<meta property=\"article:published_time\" content=\"2023-05-07T02:07:37+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2023-05-07T03:42:09+00:00\" \/>\n<meta name=\"author\" content=\"\u603b\u662f\u5e78\u798f\u7684\u8001\u8c4c\u8c46\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:label1\" content=\"\u4f5c\u8005\" \/>\n\t<meta name=\"twitter:data1\" content=\"\u603b\u662f\u5e78\u798f\u7684\u8001\u8c4c\u8c46\" \/>\n\t<meta name=\"twitter:label2\" content=\"\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4\" \/>\n\t<meta name=\"twitter:data2\" content=\"2\u5206\" \/>\n<script type=\"application\/ld+json\" class=\"yoast-schema-graph\">{\"@context\":\"https:\/\/schema.org\",\"@graph\":[{\"@type\":\"WebPage\",\"@id\":\"https:\/\/zhaocunwei.co.uk\/index.php\/2023\/05\/07\/git-merge\/\",\"url\":\"https:\/\/zhaocunwei.co.uk\/index.php\/2023\/05\/07\/git-merge\/\",\"name\":\"\u4f7f\u7528git\u8fd9\u4e48\u4e45\uff0c\u7279\u522b\u662f\u5bf9\uff1agit merge \u4e0e git rebase \u547d\u4ee4\u4e00\u76f4\u6ca1\u6709\u8be6\u7ec6\u7684\u8fdb\u884c\u603b\u7ed3\uff0c\u5199\u8fd9\u7bc7\u6587\u7ae0\uff0c\u5e0c\u671b\u80fd\u5e2e\u52a9\u5927\u5bb6\u80fd\u660e\u767d\u8fd9\u4e24\u4e2a\u6307\u4ee4\u7684\u533a\u522b\u548c\u5e94\u7528\u573a\u666f\uff0c\u611f\u8c22\u54c8\u54c8 - \u672c\u7f51\u7ad9\u5206\u4eab\u7f16\u7a0b\u8fc7\u7a0b\u4e2d\u51fa\u73b0\u7684bug\",\"isPartOf\":{\"@id\":\"https:\/\/zhaocunwei.co.uk\/#website\"},\"datePublished\":\"2023-05-07T02:07:37+00:00\",\"dateModified\":\"2023-05-07T03:42:09+00:00\",\"author\":{\"@id\":\"https:\/\/zhaocunwei.co.uk\/#\/schema\/person\/dfb1dc0fc4a330c41908d477cd99c0b4\"},\"description\":\"\u4f7f\u7528git\u8fd9\u4e48\u4e45\uff0c\u7279\u522b\u662f\u5bf9\uff1agit merge \u4e0e git rebase \u547d\u4ee4\u4e00\u76f4\u6ca1\u6709\u8be6\u7ec6\u7684\u8fdb\u884c\u603b\u7ed3\uff0c\u5199\u8fd9\u7bc7\u6587\u7ae0\uff0c\u5e0c\u671b\u80fd\u5e2e\u52a9\u5927\u5bb6\u80fd\u660e\u767d\u8fd9\u4e24\u4e2a\u6307\u4ee4\u7684\u533a\u522b\u548c\u5e94\u7528\u573a\u666f\uff0c\u611f\u8c22\u54c8\u54c8\",\"breadcrumb\":{\"@id\":\"https:\/\/zhaocunwei.co.uk\/index.php\/2023\/05\/07\/git-merge\/#breadcrumb\"},\"inLanguage\":\"zh-CN\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/zhaocunwei.co.uk\/index.php\/2023\/05\/07\/git-merge\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/zhaocunwei.co.uk\/index.php\/2023\/05\/07\/git-merge\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/zhaocunwei.co.uk\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"\u4f7f\u7528git\u8fd9\u4e48\u4e45\uff0c\u7279\u522b\u662f\u5bf9\uff1agit merge \u4e0e git rebase \u547d\u4ee4\u4e00\u76f4\u6ca1\u6709\u8be6\u7ec6\u7684\u8fdb\u884c\u603b\u7ed3\uff0c\u5199\u8fd9\u7bc7\u6587\u7ae0\uff0c\u5e0c\u671b\u80fd\u5e2e\u52a9\u5927\u5bb6\u80fd\u660e\u767d\u8fd9\u4e24\u4e2a\u6307\u4ee4\u7684\u533a\u522b\u548c\u5e94\u7528\u573a\u666f\uff0c\u611f\u8c22\u54c8\u54c8\"}]},{\"@type\":\"WebSite\",\"@id\":\"https:\/\/zhaocunwei.co.uk\/#website\",\"url\":\"https:\/\/zhaocunwei.co.uk\/\",\"name\":\"\u672c\u7f51\u7ad9\u5206\u4eab\u7f16\u7a0b\u8fc7\u7a0b\u4e2d\u51fa\u73b0\u7684bug\",\"description\":\"This site shares programming bugs\",\"potentialAction\":[{\"@type\":\"SearchAction\",\"target\":{\"@type\":\"EntryPoint\",\"urlTemplate\":\"https:\/\/zhaocunwei.co.uk\/?s={search_term_string}\"},\"query-input\":\"required name=search_term_string\"}],\"inLanguage\":\"zh-CN\"},{\"@type\":\"Person\",\"@id\":\"https:\/\/zhaocunwei.co.uk\/#\/schema\/person\/dfb1dc0fc4a330c41908d477cd99c0b4\",\"name\":\"\u603b\u662f\u5e78\u798f\u7684\u8001\u8c4c\u8c46\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-CN\",\"@id\":\"https:\/\/zhaocunwei.co.uk\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/secure.gravatar.com\/avatar\/4226cc1ca6640507df1d2d4ba3da7a62?s=96&d=mm&r=g\",\"contentUrl\":\"https:\/\/secure.gravatar.com\/avatar\/4226cc1ca6640507df1d2d4ba3da7a62?s=96&d=mm&r=g\",\"caption\":\"\u603b\u662f\u5e78\u798f\u7684\u8001\u8c4c\u8c46\"},\"sameAs\":[\"http:\/\/zhaocunwei.co.uk\"],\"url\":\"https:\/\/zhaocunwei.co.uk\/index.php\/author\/18500103508163-com\/\"}]}<\/script>\n<!-- \/ Yoast SEO plugin. -->","yoast_head_json":{"title":"\u4f7f\u7528git\u8fd9\u4e48\u4e45\uff0c\u7279\u522b\u662f\u5bf9\uff1agit merge \u4e0e git rebase \u547d\u4ee4\u4e00\u76f4\u6ca1\u6709\u8be6\u7ec6\u7684\u8fdb\u884c\u603b\u7ed3\uff0c\u5199\u8fd9\u7bc7\u6587\u7ae0\uff0c\u5e0c\u671b\u80fd\u5e2e\u52a9\u5927\u5bb6\u80fd\u660e\u767d\u8fd9\u4e24\u4e2a\u6307\u4ee4\u7684\u533a\u522b\u548c\u5e94\u7528\u573a\u666f\uff0c\u611f\u8c22\u54c8\u54c8 - \u672c\u7f51\u7ad9\u5206\u4eab\u7f16\u7a0b\u8fc7\u7a0b\u4e2d\u51fa\u73b0\u7684bug","description":"\u4f7f\u7528git\u8fd9\u4e48\u4e45\uff0c\u7279\u522b\u662f\u5bf9\uff1agit merge \u4e0e git rebase \u547d\u4ee4\u4e00\u76f4\u6ca1\u6709\u8be6\u7ec6\u7684\u8fdb\u884c\u603b\u7ed3\uff0c\u5199\u8fd9\u7bc7\u6587\u7ae0\uff0c\u5e0c\u671b\u80fd\u5e2e\u52a9\u5927\u5bb6\u80fd\u660e\u767d\u8fd9\u4e24\u4e2a\u6307\u4ee4\u7684\u533a\u522b\u548c\u5e94\u7528\u573a\u666f\uff0c\u611f\u8c22\u54c8\u54c8","robots":{"index":"index","follow":"follow","max-snippet":"max-snippet:-1","max-image-preview":"max-image-preview:large","max-video-preview":"max-video-preview:-1"},"canonical":"https:\/\/zhaocunwei.co.uk\/index.php\/2023\/05\/07\/git-merge\/","og_locale":"zh_CN","og_type":"article","og_title":"\u4f7f\u7528git\u8fd9\u4e48\u4e45\uff0c\u7279\u522b\u662f\u5bf9\uff1agit merge \u4e0e git rebase \u547d\u4ee4\u4e00\u76f4\u6ca1\u6709\u8be6\u7ec6\u7684\u8fdb\u884c\u603b\u7ed3\uff0c\u5199\u8fd9\u7bc7\u6587\u7ae0\uff0c\u5e0c\u671b\u80fd\u5e2e\u52a9\u5927\u5bb6\u80fd\u660e\u767d\u8fd9\u4e24\u4e2a\u6307\u4ee4\u7684\u533a\u522b\u548c\u5e94\u7528\u573a\u666f\uff0c\u611f\u8c22\u54c8\u54c8 - \u672c\u7f51\u7ad9\u5206\u4eab\u7f16\u7a0b\u8fc7\u7a0b\u4e2d\u51fa\u73b0\u7684bug","og_description":"\u4f7f\u7528git\u8fd9\u4e48\u4e45\uff0c\u7279\u522b\u662f\u5bf9\uff1agit merge \u4e0e git rebase \u547d\u4ee4\u4e00\u76f4\u6ca1\u6709\u8be6\u7ec6\u7684\u8fdb\u884c\u603b\u7ed3\uff0c\u5199\u8fd9\u7bc7\u6587\u7ae0\uff0c\u5e0c\u671b\u80fd\u5e2e\u52a9\u5927\u5bb6\u80fd\u660e\u767d\u8fd9\u4e24\u4e2a\u6307\u4ee4\u7684\u533a\u522b\u548c\u5e94\u7528\u573a\u666f\uff0c\u611f\u8c22\u54c8\u54c8","og_url":"https:\/\/zhaocunwei.co.uk\/index.php\/2023\/05\/07\/git-merge\/","og_site_name":"\u672c\u7f51\u7ad9\u5206\u4eab\u7f16\u7a0b\u8fc7\u7a0b\u4e2d\u51fa\u73b0\u7684bug","article_published_time":"2023-05-07T02:07:37+00:00","article_modified_time":"2023-05-07T03:42:09+00:00","author":"\u603b\u662f\u5e78\u798f\u7684\u8001\u8c4c\u8c46","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"\u603b\u662f\u5e78\u798f\u7684\u8001\u8c4c\u8c46","\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4":"2\u5206"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"WebPage","@id":"https:\/\/zhaocunwei.co.uk\/index.php\/2023\/05\/07\/git-merge\/","url":"https:\/\/zhaocunwei.co.uk\/index.php\/2023\/05\/07\/git-merge\/","name":"\u4f7f\u7528git\u8fd9\u4e48\u4e45\uff0c\u7279\u522b\u662f\u5bf9\uff1agit merge \u4e0e git rebase \u547d\u4ee4\u4e00\u76f4\u6ca1\u6709\u8be6\u7ec6\u7684\u8fdb\u884c\u603b\u7ed3\uff0c\u5199\u8fd9\u7bc7\u6587\u7ae0\uff0c\u5e0c\u671b\u80fd\u5e2e\u52a9\u5927\u5bb6\u80fd\u660e\u767d\u8fd9\u4e24\u4e2a\u6307\u4ee4\u7684\u533a\u522b\u548c\u5e94\u7528\u573a\u666f\uff0c\u611f\u8c22\u54c8\u54c8 - \u672c\u7f51\u7ad9\u5206\u4eab\u7f16\u7a0b\u8fc7\u7a0b\u4e2d\u51fa\u73b0\u7684bug","isPartOf":{"@id":"https:\/\/zhaocunwei.co.uk\/#website"},"datePublished":"2023-05-07T02:07:37+00:00","dateModified":"2023-05-07T03:42:09+00:00","author":{"@id":"https:\/\/zhaocunwei.co.uk\/#\/schema\/person\/dfb1dc0fc4a330c41908d477cd99c0b4"},"description":"\u4f7f\u7528git\u8fd9\u4e48\u4e45\uff0c\u7279\u522b\u662f\u5bf9\uff1agit merge \u4e0e git rebase \u547d\u4ee4\u4e00\u76f4\u6ca1\u6709\u8be6\u7ec6\u7684\u8fdb\u884c\u603b\u7ed3\uff0c\u5199\u8fd9\u7bc7\u6587\u7ae0\uff0c\u5e0c\u671b\u80fd\u5e2e\u52a9\u5927\u5bb6\u80fd\u660e\u767d\u8fd9\u4e24\u4e2a\u6307\u4ee4\u7684\u533a\u522b\u548c\u5e94\u7528\u573a\u666f\uff0c\u611f\u8c22\u54c8\u54c8","breadcrumb":{"@id":"https:\/\/zhaocunwei.co.uk\/index.php\/2023\/05\/07\/git-merge\/#breadcrumb"},"inLanguage":"zh-CN","potentialAction":[{"@type":"ReadAction","target":["https:\/\/zhaocunwei.co.uk\/index.php\/2023\/05\/07\/git-merge\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/zhaocunwei.co.uk\/index.php\/2023\/05\/07\/git-merge\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/zhaocunwei.co.uk\/"},{"@type":"ListItem","position":2,"name":"\u4f7f\u7528git\u8fd9\u4e48\u4e45\uff0c\u7279\u522b\u662f\u5bf9\uff1agit merge \u4e0e git rebase \u547d\u4ee4\u4e00\u76f4\u6ca1\u6709\u8be6\u7ec6\u7684\u8fdb\u884c\u603b\u7ed3\uff0c\u5199\u8fd9\u7bc7\u6587\u7ae0\uff0c\u5e0c\u671b\u80fd\u5e2e\u52a9\u5927\u5bb6\u80fd\u660e\u767d\u8fd9\u4e24\u4e2a\u6307\u4ee4\u7684\u533a\u522b\u548c\u5e94\u7528\u573a\u666f\uff0c\u611f\u8c22\u54c8\u54c8"}]},{"@type":"WebSite","@id":"https:\/\/zhaocunwei.co.uk\/#website","url":"https:\/\/zhaocunwei.co.uk\/","name":"\u672c\u7f51\u7ad9\u5206\u4eab\u7f16\u7a0b\u8fc7\u7a0b\u4e2d\u51fa\u73b0\u7684bug","description":"This site shares programming bugs","potentialAction":[{"@type":"SearchAction","target":{"@type":"EntryPoint","urlTemplate":"https:\/\/zhaocunwei.co.uk\/?s={search_term_string}"},"query-input":"required name=search_term_string"}],"inLanguage":"zh-CN"},{"@type":"Person","@id":"https:\/\/zhaocunwei.co.uk\/#\/schema\/person\/dfb1dc0fc4a330c41908d477cd99c0b4","name":"\u603b\u662f\u5e78\u798f\u7684\u8001\u8c4c\u8c46","image":{"@type":"ImageObject","inLanguage":"zh-CN","@id":"https:\/\/zhaocunwei.co.uk\/#\/schema\/person\/image\/","url":"https:\/\/secure.gravatar.com\/avatar\/4226cc1ca6640507df1d2d4ba3da7a62?s=96&d=mm&r=g","contentUrl":"https:\/\/secure.gravatar.com\/avatar\/4226cc1ca6640507df1d2d4ba3da7a62?s=96&d=mm&r=g","caption":"\u603b\u662f\u5e78\u798f\u7684\u8001\u8c4c\u8c46"},"sameAs":["http:\/\/zhaocunwei.co.uk"],"url":"https:\/\/zhaocunwei.co.uk\/index.php\/author\/18500103508163-com\/"}]}},"_links":{"self":[{"href":"https:\/\/zhaocunwei.co.uk\/index.php\/wp-json\/wp\/v2\/posts\/482"}],"collection":[{"href":"https:\/\/zhaocunwei.co.uk\/index.php\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/zhaocunwei.co.uk\/index.php\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/zhaocunwei.co.uk\/index.php\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/zhaocunwei.co.uk\/index.php\/wp-json\/wp\/v2\/comments?post=482"}],"version-history":[{"count":1,"href":"https:\/\/zhaocunwei.co.uk\/index.php\/wp-json\/wp\/v2\/posts\/482\/revisions"}],"predecessor-version":[{"id":483,"href":"https:\/\/zhaocunwei.co.uk\/index.php\/wp-json\/wp\/v2\/posts\/482\/revisions\/483"}],"wp:attachment":[{"href":"https:\/\/zhaocunwei.co.uk\/index.php\/wp-json\/wp\/v2\/media?parent=482"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/zhaocunwei.co.uk\/index.php\/wp-json\/wp\/v2\/categories?post=482"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/zhaocunwei.co.uk\/index.php\/wp-json\/wp\/v2\/tags?post=482"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}