{"id":92768,"date":"2026-08-11T08:57:23","date_gmt":"2026-08-11T00:57:23","guid":{"rendered":"https:\/\/www.wsisp.com\/helps\/92768.html"},"modified":"2026-08-11T08:57:23","modified_gmt":"2026-08-11T00:57:23","slug":"16-%e6%94%b9%e5%86%99%e5%8e%86%e5%8f%b2-rebase%ef%bc%9a%e6%90%ac%e5%ae%b6%e5%88%b0%e6%96%b0%e6%a5%bc%e5%b1%82%ef%bc%8c%e4%b8%8d%e6%98%af%e5%90%88%e5%b9%b6","status":"publish","type":"post","link":"https:\/\/www.wsisp.com\/helps\/92768.html","title":{"rendered":"16 \u2014 \u6539\u5199\u5386\u53f2 rebase\uff1a\u642c\u5bb6\u5230\u65b0\u697c\u5c42\uff0c\u4e0d\u662f\u5408\u5e76"},"content":{"rendered":"

\u5199\u5728\u524d\u9762：\u8fd9\u4e00\u7ae0\u8981\u89e3\u51b3\u4ec0\u4e48<\/h3>\n

\u5982\u679c\u4f60\u5df2\u7ecf\u4f1a\u4e86\u5206\u652f\u548c\u5408\u5e76，\u5fc3\u91cc\u53ef\u80fd\u8fd8\u6709\u4e00\u4e2a\u66f4\u5177\u4f53\u7684\u56f0\u60d1：\u6bcf\u6b21 merge \u90fd\u4f1a\u591a\u51fa\u4e00\u4e2a\u5408\u5e76\u63d0\u4ea4，\u5206\u652f\u7ebf\u7f20\u6210\u4e00\u56e2\u3002 \u6709\u6ca1\u6709\u529e\u6cd5\u628a\u4ee3\u7801\u6539\u52a8\u300c\u7406\u6210\u4e00\u6761\u76f4\u7ebf\u300d？<\/p>\n

\u5b66\u5b8c\u540e，\u4f60\u5e94\u8be5\u80fd：<\/p>\n

  • \u8bf4\u6e05\u695a rebase \u548c merge \u7684\u533a\u522b（\u7528\u300c\u642c\u5bb6\u300d\u7684\u6bd4\u55bb）<\/li>\n
  • \u7528 git rebase \u628a\u5206\u652f\u7ebf\u6574\u7406\u6210\u76f4\u7ebf<\/li>\n
  • \u7528 git rebase -i \u538b\u7f29\u3001\u6539\u5199\u3001\u91cd\u6392\u63d0\u4ea4\u8bb0\u5f55<\/li>\n
  • \u9047\u5230 rebase \u51b2\u7a81\u65f6\u51b7\u9759\u89e3\u51b3<\/li>\n
  • \u7262\u8bb0\u300c\u5df2\u63a8\u9001\u7684\u63d0\u4ea4\u7edd\u5bf9\u4e0d rebase\u300d\u8fd9\u6761\u94c1\u5f8b<\/li>\n

    \u8bfb\u8005\u8bbe\u5b9a： \u5927\u4e00\u540c\u5b66，\u5df2\u7ecf\u5b66\u8fc7\u5206\u652f\u548c\u5408\u5e76，\u77e5\u9053 commit\u3001branch\u3001merge \u662f\u4ec0\u4e48，\u4f46\u770b\u5230\u5206\u53c9\u7684\u5386\u53f2\u7ebf\u4f1a\u5934\u75bc\u3002<\/p>\n

    \n

    1. \u5b9a\u4f4d：\u4e3a\u4ec0\u4e48\u8981\u8bb2 rebase<\/h3>\n

    1.1 \u4e00\u53e5\u8bdd\u5148\u8bb0\u4f4f<\/h4>\n

    rebase = \u628a\u4f60\u7684\u6539\u52a8\u642c\u5bb6\u5230\u522b\u4eba\u6700\u65b0\u4ee3\u7801\u7684\u4e0a\u9762，\u8ba9\u5386\u53f2\u53d8\u6210\u4e00\u6761\u76f4\u7ebf\u3002<\/p>\n

    \u4e0d\u662f\u628a\u4e24\u4efd\u4ee3\u7801\u300c\u548c\u7a00\u6ce5\u300d\u6df7\u5728\u4e00\u8d77（\u90a3\u662f merge），\u800c\u662f\u628a\u4f60\u7684\u63d0\u4ea4\u4e00\u4e2a\u4e00\u4e2a\u300c\u642c\u5230\u300d\u65b0\u57fa\u7ebf\u7684\u697c\u4e0a\u3002<\/p>\n

    1.2 \u6ca1\u6709 rebase \u4f1a\u600e\u6837（\u75db\u70b9\u573a\u666f\u8868）<\/h4>\n\n\u573a\u666f\u6ca1\u6709 rebase \u7684\u75db\u6709\u4e86 rebase \u4e4b\u540e<\/tr>\n\n\n\n\n\n\n
    \u529f\u80fd\u5206\u652f\u5f00\u53d1\u4e09\u5929，\u4e3b\u5206\u652f\u5df2\u66f4\u65b0<\/td>\nmerge \u4ea7\u751f\u5408\u5e76\u63d0\u4ea4，\u5386\u53f2\u7ebf\u5206\u53c9\u53c8\u6c47\u5408<\/td>\nrebase \u8ba9\u4f60\u7684\u63d0\u4ea4\u53d8\u6210\u4e00\u6761\u76f4\u7ebf<\/td>\n<\/tr>\n
    \u63d0\u4ea4\u4e86 5 \u6b21\u5c0f\u4fee\u6539，\u5168\u662f\u300c\u4fee typo\u300d<\/td>\n\u5386\u53f2\u5168\u662f\u300c\u4fee typo\u300d\u300c\u53c8\u4fee typo\u300d，\u4e22\u4eba<\/td>\n\u4ea4\u4e92\u5f0f rebase \u628a 5 \u4e2a squash \u6210 1 \u4e2a<\/td>\n<\/tr>\n
    \u60f3\u8c03\u6574\u63d0\u4ea4\u987a\u5e8f<\/td>\n\u53ea\u80fd\u5220\u4e86\u91cd\u6765<\/td>\ngit rebase -i \u62d6\u4e00\u62d6\u987a\u5e8f\u5c31\u884c<\/td>\n<\/tr>\n
    \u5199\u9519\u63d0\u4ea4\u4fe1\u606f<\/td>\n\u6539\u4e0d\u4e86<\/td>\ngit rebase -i \u9009 reword，\u53ea\u6539\u6587\u5b57<\/td>\n<\/tr>\n
    \u4ee3\u7801\u5ba1\u67e5\u65f6\u5386\u53f2\u592a\u4e71<\/td>\n\u5ba1\u67e5\u7684\u4eba\u770b\u5f97\u773c\u82b1<\/td>\nrebase \u4e4b\u540e\u4e00\u6761\u7ebf，\u5ba1\u67e5\u66f4\u8f7b\u677e<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n

    1.3 \u548c\u4f60\u5df2\u7ecf\u4f1a\u7684\u4e8b\u5bf9\u6bd4<\/h4>\n

    \u4f60\u5df2\u7ecf\u4f1a\u4e86 git merge：\u628a\u4e24\u4e2a\u5206\u652f\u7684\u4ee3\u7801\u5408\u5230\u4e00\u8d77，\u4f1a\u4ea7\u751f\u4e00\u4e2a\u5408\u5e76\u63d0\u4ea4，\u5386\u53f2\u4f1a\u5206\u53c9\u518d\u6c47\u5408\u3002<\/p>\n\n\u5bf9\u6bd4\u9879merge（\u4f60\u5df2\u7ecf\u4f1a\u7684）rebase（\u8fd9\u4e00\u7ae0\u8981\u5b66\u7684）<\/tr>\n\n\n\n\n\n\n
    \u5386\u53f2\u7ebf\u5f62\u72b6<\/td>\n\u5206\u53c9 + \u6c47\u5408，\u6709\u5408\u5e76\u63d0\u4ea4<\/td>\n\u4e00\u6761\u76f4\u7ebf，\u6ca1\u6709\u5408\u5e76\u63d0\u4ea4<\/td>\n<\/tr>\n
    \u672c\u8d28<\/td>\n\u4e24\u4e2a\u5206\u652f\u300c\u548c\u7a00\u6ce5\u300d<\/td>\n\u4f60\u7684\u63d0\u4ea4\u300c\u642c\u5bb6\u300d\u5230\u65b0\u57fa\u7ebf\u4e0a\u9762<\/td>\n<\/tr>\n
    \u7ed3\u679c\u4ee3\u7801<\/td>\n\u4e00\u6837<\/td>\n\u4e00\u6837<\/td>\n<\/tr>\n
    \u5b89\u5168\u6027<\/td>\n\u5bf9\u5df2\u63a8\u9001\u5206\u652f\u5b89\u5168<\/td>\n\u5bf9\u5df2\u63a8\u9001\u5206\u652f\u5371\u9669<\/td>\n<\/tr>\n
    \u9002\u7528\u573a\u666f<\/td>\n\u5408\u5e76\u516c\u5171\u5206\u652f<\/td>\n\u6574\u7406\u81ea\u5df1\u7684\u529f\u80fd\u5206\u652f<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n

    \u5c0f\u63d0\u793a：\u6700\u7ec8\u4ee3\u7801\u5185\u5bb9\u662f\u4e00\u6837\u7684，\u53ea\u662f\u5386\u53f2\u7684\u4e66\u5199\u65b9\u5f0f\u4e0d\u540c\u3002merge \u4fdd\u7559\u4e86\u300c\u5206\u53c9\u8fc7\u300d\u8fd9\u4e2a\u4e8b\u5b9e，rebase \u6539\u5199\u4e86\u5386\u53f2\u8ba9\u4f60\u5047\u88c5\u300c\u4e00\u5207\u90fd\u662f\u5728\u6700\u65b0\u4ee3\u7801\u4e0a\u987a\u6ed1\u5f00\u53d1\u7684\u300d\u3002<\/p>\n

    \n

    2. \u672c\u8d28：rebase \u5230\u5e95\u662f\u4ec0\u4e48（\u767d\u8bdd + \u6bd4\u55bb + \u56fe\u89e3）<\/h3>\n

    2.1 \u642c\u5bb6\u5230\u65b0\u697c\u5c42<\/h4>\n
      \n
    • \u4e3b\u5206\u652f main \u662f\u4e00\u697c，\u6700\u8fd1\u6709\u4eba\u7ffb\u4fee\u4e86，\u5730\u9762\u6362\u6210\u4e86\u65b0\u5730\u677f\u3002<\/li>\n
    • \u4f60\u7684\u529f\u80fd\u5206\u652f \u662f\u4e8c\u697c，\u4f60\u5728\u65e7\u5730\u677f\u4e0a\u88c5\u4fee\u4e86\u81ea\u5df1\u7684\u623f\u95f4\u3002<\/li>\n<\/ul>\n

      \u73b0\u5728\u4f60\u60f3\u8ba9\u4f60\u7684\u623f\u95f4\u5efa\u5728\u65b0\u5730\u677f\u4e0a\u9762\u3002\u600e\u4e48\u529e？<\/p>\n

        \n
      • merge：\u5728\u4e00\u697c\u548c\u4e8c\u697c\u4e4b\u95f4\u642d\u4e00\u4e2a\u7a7a\u4e2d\u8d70\u5eca，\u4e24\u4e2a\u697c\u5c42\u90fd\u4fdd\u7559，\u8d70\u5eca\u5c31\u662f\u5408\u5e76\u63d0\u4ea4\u3002<\/li>\n
      • rebase：\u628a\u4f60\u7684\u6574\u4e2a\u623f\u95f4\u642c\u5230\u65b0\u5730\u677f\u4e0a\u9762\u3002\u4f60\u7684\u623f\u95f4\u4e0d\u53d8，\u4f46\u4e0b\u9762\u7684\u5730\u57fa\u53d8\u6210\u4e86\u6700\u65b0\u7684\u3002<\/li>\n<\/ul>\n

        \u7528 Git \u7684\u8bdd\u8bf4：<\/p>\n

      • \u627e\u5230\u4e24\u4e2a\u5206\u652f\u7684\u5206\u53c9\u70b9（\u5171\u540c\u7956\u5148）<\/li>\n
      • \u628a\u4f60\u7684\u5206\u652f\u4e0a\u6bcf\u4e2a\u63d0\u4ea4\u7684\u6539\u52a8\u300c\u8bb0\u5fc6\u300d\u4e0b\u6765<\/li>\n
      • \u5148\u628a\u4f60\u7684\u5206\u652f\u6307\u9488\u79fb\u5230\u76ee\u6807\u5206\u652f\u7684\u6700\u65b0\u4f4d\u7f6e（\u65b0\u57fa\u7ebf）<\/li>\n
      • \u628a\u8bb0\u5fc6\u4e0b\u6765\u7684\u6539\u52a8\u4e00\u4e2a\u4e00\u4e2a\u91cd\u65b0\u5e94\u7528\u4e0a\u53bb<\/li>\n
      • \u6bcf\u91cd\u65b0\u5e94\u7528\u4e00\u6b21，\u5c31\u4ea7\u751f\u4e00\u4e2a\u65b0\u7684\u63d0\u4ea4（\u54c8\u5e0c\u503c\u4e0d\u540c）<\/li>\n

        2.2 \u770b\u56fe\u8bf4\u8bdd<\/h4>\n

        \"\u5728\u8fd9\u91cc\u63d2\u5165\u56fe\u7247\u63cf\u8ff0\"<\/p>\n

        \u56fe：merge \u4fdd\u7559\u5206\u53c9，rebase \u53d8\u6210\u76f4\u7ebf\u3002<\/p>\n

        merge \u4e4b\u540e\u7684\u5386\u53f2：<\/p>\n

        * 5a3b1c2 Merge branch 'feature'
        \n|\\\\
        \n| * 45b9122 feat B
        \n| * f3b398d feat A
        \n* | 15c7f3e main fix
        \n|\/
        \n* 812a70d base<\/p>\n

        rebase \u4e4b\u540e\u7684\u5386\u53f2：<\/p>\n

        * 214be71 feat B（\u65b0\u54c8\u5e0c！）
        \n* a937ce2 feat A（\u65b0\u54c8\u5e0c！）
        \n* 15c7f3e main fix
        \n* 812a70d base<\/p>\n

        \u767d\u8bdd\u7ffb\u8bd1：<\/p>\n

          \n
        • merge \u540e\u6709\u4e2a\u83f1\u5f62\u5206\u53c9，5a3b1c2 \u662f\u5408\u5e76\u63d0\u4ea4<\/li>\n
        • rebase \u540e\u4e00\u6761\u76f4\u7ebf，\u4f46 45b9122 \u53d8\u6210\u4e86 214be71，f3b398d \u53d8\u6210\u4e86 a937ce2\u2014\u2014\u540c\u6837\u7684\u4ee3\u7801\u6539\u52a8，\u4f46\u54c8\u5e0c\u503c\u4e0d\u540c\u4e86<\/li>\n<\/ul>\n

          2.3 \u5173\u952e\u8ba4\u77e5：rebase \u4f1a\u4ea7\u751f\u65b0\u63d0\u4ea4<\/h4>\n

          rebase \u4e0d\u662f\u300c\u79fb\u52a8\u300d\u63d0\u4ea4，\u800c\u662f\u300c\u62c6\u6389\u91cd\u5efa\u300d\u3002<\/p>\n

          \u6bcf\u4e2a\u65b0\u63d0\u4ea4\u7684\u54c8\u5e0c\u503c\u90fd\u548c\u539f\u6765\u4e0d\u540c，\u56e0\u4e3a：<\/p>\n

            \n
          • \u7236\u63d0\u4ea4\u53d8\u4e86（\u4ece\u65e7\u57fa\u7ebf\u53d8\u6210\u65b0\u57fa\u7ebf）\u2192 \u6574\u4e2a\u63d0\u4ea4\u7684\u54c8\u5e0c\u5c31\u53d8\u4e86<\/li>\n
          • \u54c8\u5e0c\u53d8\u4e86 \u2192 \u8fd9\u5c31\u662f\u4e00\u4e2a\u5168\u65b0\u7684\u63d0\u4ea4<\/li>\n<\/ul>\n

            \u8fd9\u4e5f\u662f\u4e3a\u4ec0\u4e48\u5df2\u63a8\u9001\u7684\u63d0\u4ea4\u4e0d\u80fd rebase \u7684\u6839\u672c\u539f\u56e0：\u522b\u4eba\u5df2\u7ecf\u57fa\u4e8e\u65e7\u54c8\u5e0c\u5728\u5e72\u6d3b\u4e86，\u4f60\u5077\u5077\u6362\u6210\u65b0\u54c8\u5e0c，\u522b\u4eba\u7684\u4e16\u754c\u5c31\u5d29\u4e86\u3002<\/p>\n

            2.4 \u65b0\u624b\u6700\u5e38\u8e29\u7684\u5751<\/h4>\n\n\u5751\u540e\u679c\u600e\u4e48\u907f<\/tr>\n\n\n\n\n\n
            \u5bf9\u5df2\u63a8\u9001\u7684\u5206\u652f\u6267\u884c rebase<\/td>\n\u522b\u4eba\u62c9\u4ee3\u7801\u65f6\u51b2\u7a81\u5730\u72f1<\/td>\n\u94c1\u5f8b：\u53ea\u5bf9\u81ea\u5df1\u7684\u672c\u5730\u5206\u652f rebase<\/td>\n<\/tr>\n
            rebase \u8fc7\u7a0b\u4e2d\u614c\u4e86\u4e0d\u77e5\u9053\u600e\u4e48\u9000<\/td>\n\u5361\u5728\u4e2d\u95f4\u72b6\u6001<\/td>\ngit rebase –abort \u4e00\u952e\u56de\u5230 rebase \u4e4b\u524d<\/td>\n<\/tr>\n
            rebase \u51b2\u7a81\u65f6\u6ca1\u641e\u6e05\u8981\u4fdd\u7559\u4ec0\u4e48<\/td>\n\u6539\u9519\u4e86\u66f4\u9ebb\u70e6<\/td>\n\u51b2\u7a81\u6807\u8bb0\u548c merge \u4e00\u6837，\u5148\u770b\u61c2\u518d\u6539<\/td>\n<\/tr>\n
            \u4ee5\u4e3a rebase \u80fd\u4ee3\u66ff\u4e00\u5207<\/td>\n\u4e0d\u8be5 rebase \u7684\u5730\u65b9\u4e71\u7528<\/td>\n\u516c\u5171\u5206\u652f\u7528 merge，\u79c1\u4eba\u7684\u529f\u80fd\u5206\u652f\u624d\u7528 rebase<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n
            \n

            3. \u5efa\u8bae\u5b66\u4e60\u987a\u5e8f<\/h3>\n
          • \u5148\u770b\u7b2c 2 \u8282\u641e\u61c2\u300c\u642c\u5bb6\u300d\u6bd4\u55bb<\/li>\n
          • \u8ddf\u7740\u7b2c 5 \u8282\u505a\u4e00\u904d\u57fa\u7840 rebase<\/li>\n
          • \u518d\u5b66\u4ea4\u4e92\u5f0f rebase<\/li>\n
          • \u6700\u540e\u5b66\u51b2\u7a81\u5904\u7406\u548c\u5b89\u5168\u89c4\u77e9<\/li>\n
            \n

            4. \u52a8\u624b\u51c6\u5907（\u5efa\u53ef\u4e22\u5f03\u76ee\u5f55）<\/h3>\n

            \u8bf7\u627e\u4e00\u4e2a\u53ef\u4ee5\u968f\u4fbf\u5220\u7684\u7ec3\u4e60\u76ee\u5f55，\u4e0d\u8981\u7528\u6b63\u5728\u4ea4\u7684\u4f5c\u4e1a\u4ed3\u5e93\u7ec3\u624b\u3002<\/p>\n

            mkdir<\/span> lab-rebase
            \ncd<\/span> lab-rebase
            \ngit<\/span> init -b<\/span> main
            \ngit<\/span> config user.name "Ada Example"<\/span>
            \ngit<\/span> config user.email "ada@example.com"<\/span><\/p>\n

            \u9a8c\u8bc1\u7248\u672c：<\/p>\n

            git<\/span> –version<\/span><\/p>\n

            git version 2.43.0<\/p>\n

            \n

            5. \u8ddf\u7740\u505a：\u4e00\u6b21\u5b8c\u6574\u7684 rebase \u5b9e\u9a8c<\/h3>\n

            5.1 \u5148\u51c6\u5907\u4e24\u6761\u5206\u53c9\u7684\u5206\u652f<\/h4>\n

            # \u5728 main \u4e0a\u5efa\u57fa\u7ebf<\/span>
            \necho<\/span> "base content"<\/span> ><\/span> file.txt
            \ngit<\/span> add<\/span> file.txt &&<\/span> git<\/span> commit -m<\/span> "base: \u521d\u59cb\u6587\u4ef6"<\/span><\/p>\n

            # main \u7ee7\u7eed\u524d\u8fdb：\u4fee\u4e00\u4e2a bug<\/span>
            \necho<\/span> "bug fix from main"<\/span> >><\/span> file.txt
            \ngit<\/span> add<\/span> file.txt &&<\/span> git<\/span> commit -m<\/span> "main: \u4fee\u590d\u4e00\u4e2a bug"<\/span><\/p>\n

            # \u56de\u5230\u5206\u53c9\u70b9，\u521b\u5efa\u529f\u80fd\u5206\u652f<\/span>
            \ngit<\/span> checkout -b<\/span> feature 812a70d<\/p>\n

            \u767d\u8bdd\u7ffb\u8bd1： -b feature \u521b\u5efa\u5e76\u5207\u6362\u5230 feature \u5206\u652f，812a70d \u662f\u5206\u53c9\u70b9\u3002<\/p>\n

            # \u5728 feature \u5206\u652f\u4e0a\u505a\u4e24\u4e2a\u529f\u80fd\u63d0\u4ea4<\/span>
            \necho<\/span> "feature A"<\/span> ><\/span> feature-a.txt
            \ngit<\/span> add<\/span> feature-a.txt &&<\/span> git<\/span> commit -m<\/span> "feature: \u529f\u80fd A"<\/span><\/p>\n

            echo<\/span> "feature B"<\/span> ><\/span> feature-b.txt
            \ngit<\/span> add<\/span> feature-b.txt &&<\/span> git<\/span> commit -m<\/span> "feature: \u529f\u80fd B"<\/span><\/p>\n

            \u73b0\u5728\u770b\u770b\u5386\u53f2\u7ebf：<\/p>\n

            git<\/span> log –graph<\/span> –all<\/span> –oneline<\/span><\/p>\n

            * 45b9122 feature: \u529f\u80fd B
            \n* f3b398d feature: \u529f\u80fd A
            \n| * 15c7f3e main: \u4fee\u590d\u4e00\u4e2a bug
            \n|\/
            \n* 812a70d base: \u521d\u59cb\u6587\u4ef6<\/p>\n

            \u767d\u8bdd\u7ffb\u8bd1： |\/ \u5c31\u662f\u5206\u53c9\u70b9，\u4e24\u6761\u7ebf\u4ece 812a70d \u5206\u5f00\u3002<\/p>\n

            5.2 \u7528 merge \u5408\u5e76（\u5148\u770b\u770b\u8001\u529e\u6cd5）<\/h4>\n

            git<\/span> checkout main &&<\/span> git<\/span> merge feature<\/p>\n

            git<\/span> log –graph<\/span> –all<\/span> –oneline<\/span><\/p>\n

            * 5a3b1c2 Merge branch 'feature'
            \n|\\\\
            \n| * 45b9122 feature: \u529f\u80fd B
            \n| * f3b398d feature: \u529f\u80fd A
            \n* | 15c7f3e main: \u4fee\u590d\u4e00\u4e2a bug
            \n|\/
            \n* 812a70d base: \u521d\u59cb\u6587\u4ef6<\/p>\n

            \u767d\u8bdd\u7ffb\u8bd1： merge \u4ea7\u751f\u4e86\u4e00\u4e2a\u5408\u5e76\u63d0\u4ea4，\u5386\u53f2\u7ebf\u53d8\u6210\u4e86\u83f1\u5f62\u3002<\/p>\n

            5.3 \u64a4\u9500 merge，\u6539\u7528 rebase \u8bd5\u8bd5<\/h4>\n

            # \u9000\u56de\u53bb<\/span>
            \ngit<\/span> reset –hard<\/span> 15c7f3e<\/p>\n

            # \u5207\u5230\u529f\u80fd\u5206\u652f\u5e76 rebase \u5230 main<\/span>
            \ngit<\/span> checkout feature &&<\/span> git<\/span> rebase main<\/p>\n

            Successfully rebased and updated refs\/heads\/feature.<\/p>\n

            \u770b\u770b\u73b0\u5728\u7684\u5386\u53f2\u7ebf：<\/p>\n

            git<\/span> log –graph<\/span> –all<\/span> –oneline<\/span><\/p>\n

            * 7d4e8a3 feature: \u529f\u80fd B
            \n* a937ce2 feature: \u529f\u80fd A
            \n* 15c7f3e main: \u4fee\u590d\u4e00\u4e2a bug
            \n* 812a70d base: \u521d\u59cb\u6587\u4ef6<\/p>\n

            \u767d\u8bdd\u7ffb\u8bd1： \u4e00\u6761\u76f4\u7ebf！\u529f\u80fd A \u548c B \u7684\u54c8\u5e0c\u90fd\u53d8\u4e86，\u662f\u300c\u65b0\u697c\u5c42\u4e0a\u91cd\u5efa\u7684\u65b0\u63d0\u4ea4\u300d\u3002<\/p>\n

            5.4 \u6700\u540e\u628a feature \u5408\u5e76\u8fdb main（\u5feb\u8fdb\u5408\u5e76）<\/h4>\n

            git<\/span> checkout main &&<\/span> git<\/span> merge feature<\/p>\n

            Updating 15c7f3e..7d4e8a3
            \nFast-forward<\/p>\n

            \u767d\u8bdd\u7ffb\u8bd1： Fast-forward \u8868\u793a\u5feb\u8fdb\u5408\u5e76，\u6ca1\u6709\u5408\u5e76\u63d0\u4ea4，\u5386\u53f2\u7ebf\u5b8c\u5168\u662f\u4e00\u6761\u76f4\u7ebf\u3002<\/p>\n

            \n

            6. \u547d\u4ee4\u5206\u7ec4（\u6309\u573a\u666f\u5206\u7ec4）<\/h3>\n

            6.1 \u57fa\u672c rebase（\u65e5\u5e38\u6700\u5e38\u7528）<\/h4>\n\n\u547d\u4ee4\u5e72\u4ec0\u4e48<\/tr>\n\n\n\n\n\n
            git rebase main<\/td>\n\u628a\u5f53\u524d\u5206\u652f\u7684\u63d0\u4ea4\u642c\u5230 main \u7684\u6700\u65b0\u4ee3\u7801\u4e0a\u9762<\/td>\n<\/tr>\n
            git rebase main feature<\/td>\n\u4e0d\u7ba1\u5f53\u524d\u5728\u54ea\u4e2a\u5206\u652f，\u628a feature \u642c\u5230 main \u4e0a\u9762<\/td>\n<\/tr>\n
            git rebase –abort<\/td>\n\u653e\u5f03\u6574\u4e2a rebase，\u56de\u5230 rebase \u4e4b\u524d<\/td>\n<\/tr>\n
            git rebase –continue<\/td>\n\u89e3\u51b3\u51b2\u7a81\u540e，\u7ee7\u7eed\u6267\u884c\u5269\u4f59\u7684 rebase \u6b65\u9aa4<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n

            6.2 \u4ea4\u4e92\u5f0f rebase（\u6539\u5199\u63d0\u4ea4\u5386\u53f2）<\/h4>\n\n\u547d\u4ee4\u5e72\u4ec0\u4e48<\/tr>\n\n\n\n
            git rebase -i HEAD~3<\/td>\n\u4ea4\u4e92\u5f0f\u91cd\u505a\u6700\u8fd1 3 \u4e2a\u63d0\u4ea4<\/td>\n<\/tr>\n
            git rebase -i main<\/td>\n\u4ea4\u4e92\u5f0f\u628a\u5f53\u524d\u5206\u652f\u642c\u5230 main \u4e0a\u9762，\u540c\u65f6\u53ef\u4ee5\u6539\u5199\u6bcf\u4e2a\u63d0\u4ea4<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n

            \u4ea4\u4e92\u5f0f rebase \u91cc\u53ef\u4ee5\u7528\u7684\u52a8\u4f5c：<\/p>\n\n\u52a8\u4f5c\u7f29\u5199\u5e72\u4ec0\u4e48<\/tr>\n\n\n\n\n\n\n\n
            pick<\/td>\np<\/td>\n\u4fdd\u7559\u8fd9\u4e2a\u63d0\u4ea4，\u539f\u6837\u5e94\u7528<\/td>\n<\/tr>\n
            reword<\/td>\nr<\/td>\n\u4fdd\u7559\u4ee3\u7801\u6539\u52a8，\u4f46\u4fee\u6539\u63d0\u4ea4\u4fe1\u606f<\/td>\n<\/tr>\n
            squash<\/td>\ns<\/td>\n\u628a\u8fd9\u4e2a\u63d0\u4ea4\u548c\u524d\u4e00\u4e2a\u5408\u5e76\u6210\u4e00\u6761<\/td>\n<\/tr>\n
            fixup<\/td>\nf<\/td>\n\u548c squash \u4e00\u6837，\u4f46\u4e22\u5f03\u8fd9\u4e2a\u63d0\u4ea4\u7684\u4fe1\u606f<\/td>\n<\/tr>\n
            drop<\/td>\nd<\/td>\n\u76f4\u63a5\u6254\u6389\u8fd9\u4e2a\u63d0\u4ea4<\/td>\n<\/tr>\n
            edit<\/td>\ne<\/td>\n\u5728\u8fd9\u4e2a\u63d0\u4ea4\u5904\u6682\u505c，\u4f60\u53ef\u4ee5\u6539\u4ee3\u7801\u540e\u518d\u7ee7\u7eed<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n

            6.3 \u53d6\u6d88\u548c\u633d\u6551<\/h4>\n\n\u547d\u4ee4\u5e72\u4ec0\u4e48<\/tr>\n\n\n\n\n\n
            git rebase –abort<\/td>\n\u653e\u5f03\u672c\u6b21 rebase，\u56de\u5230 rebase \u4e4b\u524d<\/td>\n<\/tr>\n
            git rebase –skip<\/td>\n\u8df3\u8fc7\u5f53\u524d\u6b63\u5728\u5904\u7406\u7684\u63d0\u4ea4（\u614e\u7528）<\/td>\n<\/tr>\n
            git reflog<\/td>\n\u67e5\u770b HEAD \u7684\u79fb\u52a8\u5386\u53f2，\u627e\u56de rebase \u4e4b\u524d\u7684\u65e7\u63d0\u4ea4<\/td>\n<\/tr>\n
            git reset –hard \u65e7\u54c8\u5e0c<\/td>\n\u7528 reflog \u627e\u5230\u65e7\u54c8\u5e0c\u540e，\u56de\u9000\u5230 rebase \u4e4b\u524d<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n
            \n

            7. \u5bf9\u7167\u8868（\u524d\u540e\u5bf9\u6bd4 \/ \u9009\u9879\u5bf9\u6bd4）<\/h3>\n

            7.1 rebase vs merge：\u4ec0\u4e48\u65f6\u5019\u7528\u54ea\u4e2a<\/h4>\n\n\u573a\u666f\u7528 rebase\u7528 merge<\/tr>\n\n\n\n\n\n\n
            \u81ea\u5df1\u7684\u529f\u80fd\u5206\u652f\u8981\u540c\u6b65\u4e3b\u5206\u652f\u7684\u6700\u65b0\u4ee3\u7801<\/td>\n\u63a8\u8350\u2014\u2014\u5386\u53f2\u66f4\u5e72\u51c0<\/td>\n\u4e5f\u884c，\u4f46\u4f1a\u6709\u5408\u5e76\u63d0\u4ea4<\/td>\n<\/tr>\n
            \u628a\u529f\u80fd\u5206\u652f\u5408\u8fdb main<\/td>\n\u5148 rebase \u518d\u5feb\u8fdb\u5408\u5e76<\/td>\n\u76f4\u63a5 merge \u4e5f\u5b8c\u5168\u53ef\u4ee5<\/td>\n<\/tr>\n
            \u591a\u4eba\u540c\u65f6\u5728\u7528\u7684\u516c\u5171\u5206\u652f<\/td>\n\u7edd\u5bf9\u4e0d\u8981<\/td>\n\u7528 merge<\/td>\n<\/tr>\n
            \u60f3\u4fdd\u7559\u300c\u540c\u65f6\u5f00\u53d1\u4e86\u4e24\u4e2a\u529f\u80fd\u300d\u8fd9\u4e00\u4e8b\u5b9e<\/td>\nrebase \u4f1a\u4e22\u6389\u8fd9\u4e2a\u4fe1\u606f<\/td>\nmerge \u4fdd\u7559\u4e86\u5206\u53c9<\/td>\n<\/tr>\n
            \u5f00\u6e90\u9879\u76ee\u63d0\u4ea4 PR<\/td>\n\u5f88\u591a\u9879\u76ee\u8981\u6c42\u5148 rebase<\/td>\n\u770b\u9879\u76ee\u89c4\u5b9a<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n

            7.2 \u4ea4\u4e92\u5f0f rebase \u7684\u52a8\u4f5c\u5bf9\u7167<\/h4>\n\n\u4f60\u60f3\u5e72\u4ec0\u4e48\u9009\u4ec0\u4e48\u52a8\u4f5c\u4e3e\u4e2a\u4f8b\u5b50<\/tr>\n\n\n\n\n\n\n\n
            \u8fd9\u4e2a\u63d0\u4ea4\u6ca1\u95ee\u9898，\u539f\u6837\u4fdd\u7559<\/td>\npick<\/td>\n\u9ed8\u8ba4\u5c31\u662f pick<\/td>\n<\/tr>\n
            \u63d0\u4ea4\u4fe1\u606f\u5199\u9519\u4e86\u60f3\u6539<\/td>\nreword<\/td>\n\u300cfix bug\u300d\u2192\u300c\u4fee\u590d\u767b\u5f55\u9875\u9762\u9a8c\u8bc1\u7801\u4e0d\u663e\u793a\u7684 bug\u300d<\/td>\n<\/tr>\n
            3 \u4e2a\u5c0f\u63d0\u4ea4\u60f3\u5408\u6210 1 \u4e2a<\/td>\nsquash<\/td>\n\u300c\u4fee typo\u300d\u300c\u53c8\u4fee\u300d\u300c\u518d\u4fee\u300d\u2192\u300c\u4fee\u590d\u6587\u6863\u4e2d\u7684\u62fc\u5199\u9519\u8bef\u300d<\/td>\n<\/tr>\n
            \u548c\u524d\u4e00\u4e2a\u5408\u5e76，\u4f46\u4e0d\u8981\u8fd9\u4e2a\u63d0\u4ea4\u7684\u4fe1\u606f<\/td>\nfixup<\/td>\n\u4e2d\u95f4\u6b65\u9aa4\u7684\u63d0\u4ea4\u4fe1\u606f\u6ca1\u4ef7\u503c<\/td>\n<\/tr>\n
            \u8fd9\u4e2a\u63d0\u4ea4\u4e0d\u8981\u4e86<\/td>\ndrop<\/td>\n\u8bd5\u8bd5\u770b\u7684\u4ee3\u7801，\u540e\u6765\u6ca1\u7528\u4e0a<\/td>\n<\/tr>\n
            \u60f3\u4fee\u6539\u8fd9\u4e2a\u63d0\u4ea4\u7684\u4ee3\u7801<\/td>\nedit<\/td>\n\u63d0\u4ea4\u91cc\u5c11\u6539\u4e86\u4e00\u4e2a\u6587\u4ef6，\u8865\u4e0a<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n

            7.3 \u51b2\u7a81\u6807\u8bb0\u5bf9\u7167<\/h4>\n

            \"\u5728\u8fd9\u91cc\u63d2\u5165\u56fe\u7247\u63cf\u8ff0\"<\/p>\n

            \u56fe：\u51b2\u7a81\u6807\u8bb0\u957f\u8fd9\u6837\u3002<\/p>\n\n\u6807\u8bb0\u542b\u4e49\u767d\u8bdd\u89e3\u91ca<\/tr>\n\n\n\n\n
            <<<<<<< HEAD<\/td>\n\u5f53\u524d\u5206\u652f（rebase \u65f6\u662f\u4f60\u6b63\u5728\u91cd\u653e\u7684\u63d0\u4ea4）<\/td>\n\u300c\u4f60\u300d\u7684\u7248\u672c<\/td>\n<\/tr>\n
            =======<\/td>\n\u5206\u9694\u7ebf<\/td>\n\u4e0a\u9762\u662f\u4f60\u7684，\u4e0b\u9762\u662f\u522b\u4eba\u7684<\/td>\n<\/tr>\n
            >>>>>>> feature<\/td>\n\u88ab\u5408\u5e76\u8fdb\u6765\u7684\u5206\u652f<\/td>\n\u300c\u522b\u4eba\u300d\u7684\u7248\u672c<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n
            \n

            8. \u5b89\u5168\u4e60\u60ef（\u786c\u89c4\u77e9 + \u8e29\u5751\u63d0\u9192）<\/h3>\n

            8.1 \u5efa\u8bae\u8fd9\u6837\u505a<\/h4>\n\n\u4e60\u60ef\u539f\u56e0<\/tr>\n\n\n\n\n\n\n
            \u53ea\u5bf9\u81ea\u5df1\u7684\u3001\u8fd8\u6ca1\u63a8\u9001\u7684\u5206\u652f\u505a rebase<\/td>\n\u6ca1\u4eba\u57fa\u4e8e\u4f60\u7684\u65e7\u63d0\u4ea4\u5728\u5e72\u6d3b，\u6539\u5199\u5386\u53f2\u4e0d\u4f1a\u5f71\u54cd\u522b\u4eba<\/td>\n<\/tr>\n
            rebase \u4e4b\u524d\u5148 git status \u786e\u8ba4\u5de5\u4f5c\u533a\u5e72\u51c0<\/td>\n\u810f\u5de5\u4f5c\u533a\u4f1a\u5bfc\u81f4 rebase \u51fa\u9519\u6216\u4e2d\u9014\u5361\u4f4f<\/td>\n<\/tr>\n
            rebase \u4e4b\u524d\u5148\u770b\u4e00\u4e0b\u5206\u652f\u7ebf git log –graph<\/td>\n\u786e\u8ba4\u4f60\u77e5\u9053\u8981 rebase \u7684\u8303\u56f4<\/td>\n<\/tr>\n
            \u51b2\u7a81\u65f6\u51b7\u9759\u770b\u6807\u8bb0，\u60f3\u6e05\u695a\u8981\u4fdd\u7559\u4ec0\u4e48<\/td>\n\u522b\u6025\u7740\u5220，\u5148\u7406\u89e3<\/td>\n<\/tr>\n
            rebase \u5931\u8d25\u4e86\u5148 –abort<\/td>\n\u56de\u5230\u539f\u70b9\u91cd\u65b0\u6765，\u6bd4\u786c\u7740\u5934\u76ae\u8d70\u4e0b\u53bb\u5b89\u5168<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n

            8.2 \u7edd\u5bf9\u4e0d\u8981\u8fd9\u6837\u505a<\/h4>\n\n\u7981\u6b62\u64cd\u4f5c\u540e\u679c<\/tr>\n\n\n\n\n\n
            \u5bf9\u5df2\u63a8\u9001\u5230\u8fdc\u7a0b\u7684\u516c\u5171\u5206\u652f\u6267\u884c rebase<\/td>\n\u522b\u4eba\u7684\u672c\u5730\u5386\u53f2\u548c\u4f60\u4e0d\u4e00\u6837\u4e86，\u62c9\u4ee3\u7801\u65f6\u51b2\u7a81\u5730\u72f1<\/td>\n<\/tr>\n
            \u5728 rebase \u4e2d\u9014\u7528 –skip \u968f\u610f\u8df3\u8fc7\u63d0\u4ea4<\/td>\n\u4f60\u8df3\u8fc7\u7684\u90a3\u4e2a\u63d0\u4ea4\u7684\u4ee3\u7801\u6539\u52a8\u5c31\u4e22\u4e86<\/td>\n<\/tr>\n
            rebase \u65f6\u9047\u5230\u51b2\u7a81\u76f4\u63a5 git add . + git rebase –continue<\/td>\n\u4e0d\u770b\u51b2\u7a81\u5185\u5bb9\u5c31\u5168\u76d8\u63a5\u53d7，\u53ef\u80fd\u8986\u76d6\u6389\u522b\u4eba\u7684\u4ee3\u7801<\/td>\n<\/tr>\n
            \u540c\u65f6\u5f00\u4e24\u4e2a\u7ec8\u7aef\u5bf9\u540c\u4e00\u4e2a\u4ed3\u5e93\u505a rebase<\/td>\nGit \u4f1a\u6253\u67b6，\u72b6\u6001\u4e71\u6210\u4e00\u9505\u7ca5<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n

            \u94c1\u5f8b：\u6c38\u8fdc\u4e0d\u8981 rebase \u5df2\u7ecf\u63a8\u9001\u5230\u5171\u4eab\u5206\u652f\u4e0a\u7684\u63d0\u4ea4\u3002 \u8fdd\u53cd\u8fd9\u6761\u89c4\u5219\u7684\u540e\u679c\u662f：\u56e2\u961f\u6210\u5458\u62c9\u4ee3\u7801\u65f6\u4f1a\u53d1\u73b0\u5386\u53f2\u5bf9\u4e0d\u4e0a，\u8981\u4e48\u5408\u4e0d\u51fa\u6765，\u8981\u4e48\u91cd\u590d\u63d0\u4ea4\u6ee1\u5929\u98de\u3002\u5982\u679c\u4e00\u5b9a\u8981\u6539\u5df2\u63a8\u9001\u7684\u5386\u53f2，\u5fc5\u987b\u548c\u6240\u6709\u76f8\u5173\u7684\u4eba\u534f\u8c03\u597d，\u800c\u4e14\u8981\u7528 –force-with-lease \u800c\u4e0d\u662f –force\u3002<\/p>\n

            8.3 \u63a8\u8350\u7684\u6700\u5c0f\u6d41\u7a0b（\u80cc\u4e0b\u6765）<\/h4>\n

            # 1. \u786e\u8ba4\u5728\u529f\u80fd\u5206\u652f\u4e0a<\/span>
            \ngit<\/span> branch
            \n# 2. \u786e\u8ba4\u5de5\u4f5c\u533a\u5e72\u51c0<\/span>
            \ngit<\/span> status
            \n# 3. \u770b\u4e00\u773c\u5f53\u524d\u5386\u53f2<\/span>
            \ngit<\/span> log –oneline<\/span> -5<\/span>
            \n# 4. \u6267\u884c rebase<\/span>
            \ngit<\/span> rebase main
            \n# 5. \u5982\u679c\u6709\u51b2\u7a81：<\/span>
            \n# – \u6253\u5f00\u51b2\u7a81\u6587\u4ef6，\u770b <<<<<<< \u548c >>>>>>> \u4e4b\u95f4\u7684\u5185\u5bb9<\/span>
            \n# – \u624b\u52a8\u6539\u6210\u4f60\u60f3\u8981\u7684\u7ed3\u679c<\/span>
            \n# – git add \u51b2\u7a81\u6587\u4ef6<\/span>
            \n# – git rebase –continue<\/span>
            \n# 6. \u5982\u679c\u641e\u7838\u4e86：<\/span>
            \n# – git rebase –abort（\u56de\u5230\u7b2c 3 \u6b65\u7684\u72b6\u6001）<\/span>
            \n# 7. \u786e\u8ba4\u7ed3\u679c<\/span>
            \ngit<\/span> log –graph<\/span> –oneline<\/span> -10<\/span><\/p>\n

            \n

            9. \u771f\u5b9e\u573a\u666f\u901f\u89c8<\/h3>\n

            9.1 \u8bfe\u7a0b\u5927\u4f5c\u4e1a：\u529f\u80fd\u5206\u652f\u8981\u540c\u6b65\u4e3b\u5206\u652f<\/h4>\n

            \u4f60\u548c\u7ec4\u5458\u534f\u4f5c\u5199\u5927\u4f5c\u4e1a，\u4f60\u7684 feature-login \u5206\u652f\u5199\u4e86\u4e24\u5929，Meanwhile \u7ec4\u5458\u5df2\u7ecf\u628a\u6ce8\u518c\u529f\u80fd\u5408\u5e76\u5230 main \u4e86\u3002<\/p>\n

            git<\/span> checkout feature-login &&<\/span> git<\/span> rebase main<\/p>\n

            \u4f60\u7684\u767b\u5f55\u529f\u80fd\u5c31\u300c\u642c\u300d\u5230\u5305\u542b\u6ce8\u518c\u529f\u80fd\u7684\u6700\u65b0\u4ee3\u7801\u4e0a\u9762\u4e86\u3002\u5982\u679c\u51b2\u7a81，\u6309\u7b2c 8 \u8282\u7684\u6d41\u7a0b\u89e3\u51b3\u3002<\/p>\n

            9.2 \u63d0\u4ea4\u592a\u591a\u592a\u788e，\u63d0\u4ea4\u524d\u60f3\u6574\u7406<\/h4>\n

            \u4f60\u5199\u4ee3\u7801\u65f6\u4e60\u60ef\u6bcf\u6539\u4e00\u70b9\u5c31 commit \u4e00\u6b21，\u73b0\u5728 git log \u4e00\u770b\u6709 8 \u4e2a\u63d0\u4ea4，\u4fe1\u606f\u5168\u662f\u300c\u6539\u4e86\u70b9\u4e1c\u897f\u300d\u300c\u518d\u6539\u6539\u300d\u300c\u5e94\u8be5\u597d\u4e86\u300d\u3002<\/p>\n

            git<\/span> rebase -i<\/span> HEAD~8<\/p>\n

            \u5728\u7f16\u8f91\u5668\u91cc\u628a 8 \u4e2a\u63d0\u4ea4\u7684 pick \u6539\u6210：<\/p>\n

            pick a1b2c3d \u5b9e\u73b0\u767b\u5f55\u9a8c\u8bc1
            \nsquash e4f5g6h \u6539\u4e86\u70b9\u4e1c\u897f
            \nsquash i7j8k9l \u518d\u6539\u6539
            \nsquash m0n1o2p \u5e94\u8be5\u597d\u4e86
            \npick q3r4s5t \u5b9e\u73b0\u6ce8\u518c\u9875\u9762
            \nsquash t5u6v7w \u4fee\u4e86\u6ce8\u518c\u7684 typo
            \nsquash w8x9y0z \u53c8\u4fee
            \ndrop a1b2c3e \u8fd9\u6b21\u6539\u6ca1\u7528<\/p>\n

            \u4fdd\u5b58\u9000\u51fa\u540e，Git \u4f1a\u4f9d\u6b21\u5904\u7406：\u524d 4 \u4e2a\u5408\u6210 1 \u4e2a，\u7b2c 5-7 \u4e2a\u5408\u6210 1 \u4e2a，\u7b2c 8 \u4e2a\u76f4\u63a5\u5220\u6389\u3002\u6700\u7ec8 8 \u4e2a\u63d0\u4ea4\u53d8\u6210 2 \u4e2a，\u5e72\u5e72\u51c0\u51c0\u3002<\/p>\n

            9.3 \u4ee3\u7801\u5ba1\u67e5\u524d\u6574\u7406\u5386\u53f2<\/h4>\n

            \u63d0 PR \u4e4b\u524d，\u7528 git rebase -i \u628a\u96f6\u788e\u7684\u63d0\u4ea4\u538b\u7f29\u6210\u51e0\u4e2a\u6709\u610f\u4e49\u7684\u63d0\u4ea4\u3002\u6539\u5b8c\u4e4b\u540e force push \u5230\u4f60\u81ea\u5df1\u7684 fork\u3002<\/p>\n

            git<\/span> rebase -i<\/span> main
            \n# \u6574\u7406\u597d\u4e4b\u540e<\/span>
            \ngit<\/span> push –force-with-lease origin feature-branch<\/p>\n

            –force-with-lease \u6bd4 –force \u5b89\u5168\u2014\u2014\u5982\u679c\u522b\u4eba\u5728\u4f60\u4e4b\u540e\u4e5f\u63a8\u4e86\u4ee3\u7801，\u5b83\u4f1a\u62d2\u7edd\u63a8\u9001，\u4e0d\u4f1a\u8986\u76d6\u522b\u4eba\u7684\u5de5\u4f5c\u3002<\/p>\n

            \n

            10. \u8fdb\u9636\u8865\u5145（\u9009\u8bfb）<\/h3>\n
          • rebase \u7684\u5e95\u5c42\u539f\u7406： rebase \u5176\u5b9e\u662f\u4e00\u8fde\u4e32 git cherry-pick\u3002\u5b83\u627e\u5230\u5206\u53c9\u70b9\u540e，\u4f9d\u6b21\u628a\u4f60\u5206\u652f\u4e0a\u7684\u6bcf\u4e2a\u63d0\u4ea4\u300c\u6458\u300d\u4e0b\u6765，\u5728\u65b0\u57fa\u7ebf\u4e0a\u91cd\u65b0\u300c\u79cd\u300d\u4e0a\u53bb\u3002<\/li>\n
          • onto \u53c2\u6570： git rebase –onto new-base upstream branch \u53ef\u4ee5\u628a branch \u4e0a\u4ece upstream \u4e4b\u540e\u7684\u63d0\u4ea4\u642c\u5230 new-base \u4e0a，\u9002\u5408\u4ece\u4e00\u4e2a\u5927\u529f\u80fd\u5206\u652f\u91cc\u300c\u5207\u300d\u51fa\u4e00\u90e8\u5206\u63d0\u4ea4\u3002<\/li>\n
          • Autosquash： \u5982\u679c\u4f60\u63d0\u4ea4\u65f6\u7528\u4e86 git commit –fixup=\u54c8\u5e0c \u6216 –squash=\u54c8\u5e0c，rebase \u65f6\u52a0 –autosquash \u53c2\u6570，Git \u4f1a\u81ea\u52a8\u628a fixup \u63d0\u4ea4\u653e\u5230\u5bf9\u5e94\u7684\u76ee\u6807\u63d0\u4ea4\u65c1\u8fb9\u3002<\/li>\n
          • rebase \u548c merge \u53ef\u4ee5\u5171\u5b58： \u56e2\u961f\u91cc\u5e38\u7528\u7684\u5de5\u4f5c\u6d41\u662f\u300c\u672c\u5730\u7528 rebase \u4fdd\u6301\u76f4\u7ebf，\u5408\u8fdb main \u65f6\u7528 merge \u4fdd\u7559\u5206\u53c9\u8bb0\u5f55\u300d\u3002\u4e0d\u7528\u975e\u6b64\u5373\u5f7c\u3002<\/li>\n
            \n

            11. \u5c0f\u5b9e\u9a8c（\u52a8\u624b\u7ec3\u4e60 + \u901a\u8fc7\u6807\u51c6）<\/h3>\n

            \u5b9e\u9a8c\u7532：\u57fa\u7840 rebase\u2014\u2014\u628a\u5206\u53c9\u53d8\u6210\u76f4\u7ebf<\/h4>\n
          • \u5efa\u4e00\u4e2a\u53ef\u4e22\u5f03\u76ee\u5f55，\u5728 main \u4e0a\u63d0\u4ea4\u4e00\u4e2a\u57fa\u7ebf\u6587\u4ef6<\/li>\n
          • main \u4e0a\u518d\u63d0\u4ea4\u4e00\u6b21（\u6bd4\u5982\u4fee\u4e2a bug）<\/li>\n
          • \u4ece\u57fa\u7ebf\u5904\u521b\u5efa feature \u5206\u652f，\u505a\u4e24\u4e2a\u529f\u80fd\u63d0\u4ea4<\/li>\n
          • \u7528 git log –graph –all –oneline \u786e\u8ba4\u770b\u5230\u5206\u53c9<\/li>\n
          • \u5728 feature \u5206\u652f\u4e0a\u6267\u884c git rebase main<\/li>\n
          • \u518d\u770b git log –graph –all –oneline，\u786e\u8ba4\u53d8\u6210\u4e00\u6761\u76f4\u7ebf<\/li>\n

            \u901a\u8fc7\u6807\u51c6： rebase \u540e\u5386\u53f2\u7ebf\u662f\u4e00\u6761\u76f4\u7ebf，\u6ca1\u6709\u5408\u5e76\u63d0\u4ea4，\u529f\u80fd\u63d0\u4ea4\u7684\u54c8\u5e0c\u503c\u53d8\u4e86\u3002<\/p>\n

            \u5b9e\u9a8c\u4e59：\u4ea4\u4e92\u5f0f rebase\u2014\u2014\u538b\u7f29\u63d0\u4ea4<\/h4>\n
          • \u5728\u4e00\u4e2a\u5206\u652f\u4e0a\u8fde\u7eed\u63d0\u4ea4 3 \u6b21，\u4fe1\u606f\u5206\u522b\u662f\u300c\u6b65\u9aa4\u4e00\u300d\u300c\u6b65\u9aa4\u4e8c\u300d\u300c\u6b65\u9aa4\u4e09\u300d<\/li>\n
          • \u6267\u884c git rebase -i HEAD~3<\/li>\n
          • \u628a\u7b2c\u4e8c\u4e2a\u548c\u7b2c\u4e09\u4e2a\u7684 pick \u6539\u6210 squash<\/li>\n
          • \u5728\u5f39\u51fa\u7684\u7f16\u8f91\u5668\u91cc\u7f16\u8f91\u5408\u5e76\u540e\u7684\u63d0\u4ea4\u4fe1\u606f<\/li>\n
          • \u786e\u8ba4 git log –oneline \u53ea\u5269 1 \u4e2a\u63d0\u4ea4<\/li>\n

            \u901a\u8fc7\u6807\u51c6： 3 \u4e2a\u63d0\u4ea4\u538b\u7f29\u6210 1 \u4e2a，\u4ee3\u7801\u5185\u5bb9\u4e0d\u53d8\u3002<\/p>\n

            \u5b9e\u9a8c\u4e19：rebase \u51b2\u7a81\u89e3\u51b3<\/h4>\n
          • \u5728 main \u548c feature \u5206\u652f\u4e0a\u4fee\u6539\u540c\u4e00\u4e2a\u6587\u4ef6\u7684\u540c\u4e00\u884c，\u5199\u4e0d\u540c\u5185\u5bb9<\/li>\n
          • \u5728 feature \u5206\u652f\u4e0a\u6267\u884c git rebase main<\/li>\n
          • \u770b\u5230\u51b2\u7a81\u63d0\u793a\u540e，\u6253\u5f00\u6587\u4ef6\u67e5\u770b <<<<<<< \u6807\u8bb0<\/li>\n
          • \u624b\u52a8\u89e3\u51b3\u51b2\u7a81（\u4fdd\u7559\u4f60\u60f3\u8981\u7684\u5185\u5bb9，\u5220\u6389\u6807\u8bb0）<\/li>\n
          • git add \u51b2\u7a81\u6587\u4ef6，\u7136\u540e git rebase –continue<\/li>\n
          • \u786e\u8ba4 rebase \u5b8c\u6210，\u5386\u53f2\u7ebf\u662f\u76f4\u7ebf<\/li>\n

            \u901a\u8fc7\u6807\u51c6： \u80fd\u72ec\u7acb\u4ece\u51b2\u7a81\u72b6\u6001\u8d70\u5230 rebase \u5b8c\u6210，\u6700\u7ec8\u4ee3\u7801\u662f\u4f60\u671f\u671b\u7684\u5185\u5bb9\u3002<\/p>\n

            \u5b9e\u9a8c\u4e01：rebase abort\u2014\u2014\u968f\u65f6\u80fd\u8dd1<\/h4>\n
          • \u5236\u9020\u4e00\u4e2a rebase \u51b2\u7a81（\u540c\u5b9e\u9a8c\u4e19\u524d\u4e24\u6b65）<\/li>\n
          • \u770b\u5230\u51b2\u7a81\u540e，\u4e0d\u89e3\u51b3，\u76f4\u63a5\u6267\u884c git rebase –abort<\/li>\n
          • \u786e\u8ba4 git log –graph –oneline \u548c rebase \u4e4b\u524d\u4e00\u6a21\u4e00\u6837<\/li>\n

            \u901a\u8fc7\u6807\u51c6： abort \u540e\u4ed3\u5e93\u5b8c\u6574\u56de\u5230 rebase \u4e4b\u524d\u7684\u72b6\u6001，\u6ca1\u6709\u4efb\u4f55\u6b8b\u7559\u3002<\/p>\n

            \n

            12. \u5e38\u89c1\u95ee\u9898 FAQ<\/h3>\n

            \u95ee 1：rebase \u548c merge \u5230\u5e95\u54ea\u4e2a\u66f4\u597d？ \u6ca1\u6709\u7edd\u5bf9\u7684\u597d\u574f\u3002merge \u4fdd\u7559\u771f\u5b9e\u5386\u53f2，rebase \u8ba9\u5386\u53f2\u66f4\u6574\u6d01\u3002\u81ea\u5df1\u7684\u529f\u80fd\u5206\u652f\u7528 rebase \u6574\u7406，\u5408\u8fdb\u516c\u5171\u5206\u652f\u7528 merge \u8bb0\u5f55\u3002\u4e24\u6761\u8def\u6700\u7ec8\u7684\u4ee3\u7801\u662f\u4e00\u6837\u7684\u3002<\/p>\n

            \u95ee 2：\u4e3a\u4ec0\u4e48 rebase \u540e\u63d0\u4ea4\u7684\u54c8\u5e0c\u503c\u53d8\u4e86？ \u56e0\u4e3a\u63d0\u4ea4\u7684\u54c8\u5e0c\u662f\u6839\u636e\u300c\u5185\u5bb9 + \u7236\u63d0\u4ea4 + \u4f5c\u8005\u4fe1\u606f + \u65f6\u95f4\u300d\u7b97\u51fa\u6765\u7684\u3002rebase \u6539\u53d8\u4e86\u7236\u63d0\u4ea4，\u6240\u4ee5\u54c8\u5e0c\u5fc5\u7136\u4e0d\u540c\u3002\u4ee3\u7801\u6539\u52a8\u4e0d\u53d8，\u4f46\u63d0\u4ea4\u5bf9\u8c61\u662f\u5168\u65b0\u7684\u3002<\/p>\n

            \u95ee 3：rebase \u5230\u4e00\u534a\u4e0d\u60f3\u505a\u4e86\u600e\u4e48\u529e？ git rebase –abort，\u4e00\u79d2\u56de\u5230 rebase \u4e4b\u524d\u3002\u8fd9\u662f rebase \u7684\u5b89\u5168\u7f51，\u5927\u80c6\u7528\u3002<\/p>\n

            \u95ee 4：\u6211\u5728 rebase \u65f6\u51b2\u7a81\u4e86，\u600e\u4e48\u77e5\u9053\u8be5\u4fdd\u7559\u8c01\u7684？ <<<<<<< HEAD \u548c ======= \u4e4b\u95f4\u662f\u4f60\u5f53\u524d\u6b63\u5728\u91cd\u653e\u7684\u63d0\u4ea4\u7684\u4ee3\u7801，======= \u548c >>>>>>> \u4e4b\u95f4\u662f\u65b0\u57fa\u7ebf\u4e0a\u7684\u4ee3\u7801\u3002\u6839\u636e\u5b9e\u9645\u60c5\u51b5\u51b3\u5b9a\u4fdd\u7559\u54ea\u90e8\u5206\u3002<\/p>\n

            \u95ee 5：\u4ea4\u4e92\u5f0f rebase \u5f39\u51fa\u7684\u7f16\u8f91\u5668\u6211\u4e0d\u4f1a\u7528\u600e\u4e48\u529e？ \u9ed8\u8ba4\u7f16\u8f91\u5668\u53ef\u80fd\u662f vim\u3002\u8fdb\u53bb\u540e\u6309 i \u8fdb\u5165\u7f16\u8f91\u6a21\u5f0f，\u6539\u5b8c\u6309 Esc，\u8f93\u5165 :wq \u4fdd\u5b58\u9000\u51fa\u3002\u4e0d\u4e60\u60ef\u7684\u8bdd\u53ef\u4ee5\u8bbe\u7f6e\u7f16\u8f91\u5668：git config core.editor "code –wait"（\u7528 VS Code）\u6216 git config core.editor "nano"\u3002<\/p>\n

            \u95ee 6：squash \u548c fixup \u6709\u4ec0\u4e48\u533a\u522b？ squash \u4f1a\u628a\u4e24\u4e2a\u63d0\u4ea4\u7684\u63d0\u4ea4\u4fe1\u606f\u90fd\u4fdd\u7559，\u8ba9\u4f60\u7f16\u8f91\u5408\u5e76\u540e\u7684\u4fe1\u606f\u3002fixup \u76f4\u63a5\u4e22\u5f03\u88ab\u5408\u5e76\u63d0\u4ea4\u7684\u4fe1\u606f，\u53ea\u4fdd\u7559\u7b2c\u4e00\u4e2a\u63d0\u4ea4\u7684\u4fe1\u606f\u3002<\/p>\n

            \n

            13. \u603b\u7ed3<\/h3>\n

            13.1 \u4e00\u9875\u901f\u8bb0<\/h4>\n\n\u70b9\u8bb0\u4f4f\u4ec0\u4e48<\/tr>\n\n\n\n\n\n\n\n\n\n\n
            rebase \u662f\u4ec0\u4e48<\/td>\n\u628a\u4f60\u7684\u63d0\u4ea4\u300c\u642c\u5bb6\u300d\u5230\u65b0\u57fa\u7ebf\u4e0a\u9762，\u5386\u53f2\u53d8\u76f4\u7ebf<\/td>\n<\/tr>\n
            \u548c merge \u7684\u533a\u522b<\/td>\nmerge \u4fdd\u7559\u5206\u53c9，rebase \u6539\u5199\u6210\u76f4\u7ebf；\u6700\u7ec8\u4ee3\u7801\u4e00\u6837<\/td>\n<\/tr>\n
            \u54c8\u5e0c\u4f1a\u53d8<\/td>\n\u642c\u5bb6 = \u62c6\u6389\u91cd\u5efa，\u63d0\u4ea4\u662f\u65b0\u7684，\u54c8\u5e0c\u4e0d\u540c<\/td>\n<\/tr>\n
            \u4ea4\u4e92\u5f0f rebase<\/td>\n-i \u53c2\u6570，\u53ef\u4ee5 squash \/ reword \/ drop \/ reorder<\/td>\n<\/tr>\n
            \u51b2\u7a81\u5904\u7406<\/td>\n\u548c merge \u4e00\u6837\u770b\u6807\u8bb0，\u89e3\u51b3\u540e add + –continue<\/td>\n<\/tr>\n
            \u653e\u5f03 rebase<\/td>\ngit rebase –abort \u968f\u65f6\u9000\u56de<\/td>\n<\/tr>\n
            \u94c1\u5f8b<\/td>\n\u6c38\u8fdc\u4e0d\u8981 rebase \u5df2\u63a8\u9001\u5230\u5171\u4eab\u5206\u652f\u7684\u63d0\u4ea4<\/td>\n<\/tr>\n
            \u4ec0\u4e48\u65f6\u5019\u7528<\/td>\n\u81ea\u5df1\u7684\u672c\u5730\u529f\u80fd\u5206\u652f\u540c\u6b65\u4e3b\u5206\u652f \/ \u6574\u7406\u63d0\u4ea4 \/ \u4ee3\u7801\u5ba1\u67e5\u524d<\/td>\n<\/tr>\n
            \u627e\u56de\u65e7\u63d0\u4ea4<\/td>\ngit reflog \u67e5\u770b，git reset –hard \u56de\u9000<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n

            13.2 \u601d\u7ef4\u5347\u534e<\/h4>\n

            rebase \u6539\u5199\u7684\u662f\u300c\u5386\u53f2\u600e\u4e48\u8bb2\u300d，\u4e0d\u662f\u300c\u4ee3\u7801\u662f\u4ec0\u4e48\u300d\u3002<\/p>\n

            \u540c\u6837\u7684\u4ee3\u7801，merge \u8bb2\u4e86\u4e00\u4e2a\u300c\u4e24\u6761\u8def\u6c47\u5408\u300d\u7684\u6545\u4e8b，rebase \u8bb2\u4e86\u4e00\u4e2a\u300c\u4e00\u8def\u5411\u4e0a\u300d\u7684\u6545\u4e8b\u3002\u6545\u4e8b\u4e0d\u540c，\u7ed3\u5c40\u4e00\u6837\u3002\u4f46\u8bb0\u4f4f：\u516c\u5171\u7684\u5386\u53f2\u4e0d\u80fd\u4f60\u4e00\u4e2a\u4eba\u5077\u5077\u6539\u5199\u2014\u2014\u6539\u6545\u4e8b\u4e4b\u524d，\u5148\u786e\u8ba4\u53ea\u6709\u4f60\u4e00\u4e2a\u4eba\u5728\u8bfb\u8fd9\u672c\u4e66\u3002<\/p>\n

            13.3 \u5ef6\u4f38\u9605\u8bfb<\/h4>\n
              \n
            • Pro Git \u4e2d\u6587\u7248 \u2014 \u53d8\u57fa<\/li>\n
            • Git \u5b98\u65b9\u6587\u6863 \u2014 git-rebase<\/li>\n
            • Git \u672f\u8bed\u8868<\/li>\n<\/ul>\n

              \u547d\u4ee4\u8f93\u51fa\u6837\u4f8b\u9a8c\u8bc1\u73af\u5883：Git 2.43.0；\u6f14\u793a\u4f5c\u8005\u4fe1\u606f\u4e3a\u865a\u6784：Ada Example <ada@example.com>\u3002<\/p>\n

              13.4 \u68c0\u67e5\u6e05\u5355<\/h4>\n
                \n
              • \u80fd\u7528\u300c\u642c\u5bb6\u5230\u65b0\u697c\u5c42\u300d\u7684\u6bd4\u55bb\u89e3\u91ca rebase \u7ed9\u540c\u5b66\u542c<\/li>\n
              • \u80fd\u8bf4\u51fa rebase \u548c merge \u7684 3 \u4e2a\u533a\u522b<\/li>\n
              • \u80fd\u72ec\u7acb\u5b8c\u6210\u4e00\u6b21\u57fa\u7840 rebase（\u4e0d\u5206\u53c9\u53d8\u6210\u76f4\u7ebf）<\/li>\n
              • \u80fd\u7528\u4ea4\u4e92\u5f0f rebase \u538b\u7f29\u591a\u4e2a\u63d0\u4ea4<\/li>\n
              • \u9047\u5230 rebase \u51b2\u7a81\u4e0d\u614c，\u77e5\u9053\u5982\u4f55\u89e3\u51b3<\/li>\n
              • \u77e5\u9053 –abort \u53ef\u4ee5\u968f\u65f6\u653e\u5f03 rebase<\/li>\n
              • \u7262\u8bb0\u94c1\u5f8b：\u4e0d rebase \u5df2\u63a8\u9001\u5230\u5171\u4eab\u5206\u652f\u7684\u63d0\u4ea4<\/li>\n
              • \u5b8c\u6210 4 \u4e2a\u5c0f\u5b9e\u9a8c<\/li>\n<\/ul>\n
                \n

                rebase \u7ed9\u4e86\u4f60\u6539\u5199\u5386\u53f2\u7684\u8d85\u80fd\u529b，\u4f46\u300c\u80fd\u529b\u8d8a\u5927，\u8d23\u4efb\u8d8a\u5927\u300d\u2014\u2014\u53ea\u6539\u81ea\u5df1\u7684\u5386\u53f2，\u4e0d\u8981\u52a8\u522b\u4eba\u7684\u3002\u4e0b\u4e00\u7ae0\u6211\u4eec\u8bb2 reflog：\u5c31\u7b97 rebase \u7ffb\u8f66\u4e86，\u4e5f\u8fd8\u6709\u529e\u6cd5\u6551\u4eba\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"

                \u5199\u5728\u524d\u9762：\u8fd9\u4e00\u7ae0\u8981\u89e3\u51b3\u4ec0\u4e48
                \n\u5982\u679c\u4f60\u5df2\u7ecf\u4f1a\u4e86\u5206\u652f\u548c\u5408\u5e76，\u5fc3\u91cc\u53ef\u80fd\u8fd8\u6709\u4e00\u4e2a\u66f4\u5177\u4f53\u7684\u56f0\u60d1：\u6bcf\u6b21 merge \u90fd\u4f1a\u591a\u51fa\u4e00\u4e2a\u5408\u5e76\u63d0\u4ea4，\u5206\u652f\u7ebf\u7f20\u6210\u4e00\u56e2\u3002 \u6709\u6ca1\u6709\u529e\u6cd5\u628a\u4ee3\u7801\u6539\u52a8\u300c\u7406\u6210\u4e00\u6761\u76f4\u7ebf\u300d？
                \n\u5b66\u5b8c\u540e，\u4f60\u5e94\u8be5\u80fd：
                \n\u8bf4\u6e05\u695a rebase \u548c merge \u7684\u533a\u522b（\u7528\u300c\u642c\u5bb6\u300d\u7684\u6bd4\u55bb）\u7528 git rebase \u628a\u5206\u652f\u7ebf\u6574\u7406\u6210\u76f4\u7ebf\u7528 git rebase -i \u538b\u7f29\u3001<\/p>\n","protected":false},"author":2,"featured_media":92766,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[89],"topic":[],"class_list":["post-92768","post","type-post","status-publish","format-standard","has-post-thumbnail","hentry","category-server","tag-git"],"yoast_head":"\n16 \u2014 \u6539\u5199\u5386\u53f2 rebase\uff1a\u642c\u5bb6\u5230\u65b0\u697c\u5c42\uff0c\u4e0d\u662f\u5408\u5e76 - \u7f51\u7855\u4e92\u8054\u5e2e\u52a9\u4e2d\u5fc3<\/title>\n<meta name=\"robots\" content=\"index, follow, max-snippet:-1, max-image-preview:large, max-video-preview:-1\" \/>\n<link rel=\"canonical\" href=\"https:\/\/www.wsisp.com\/helps\/92768.html\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"16 \u2014 \u6539\u5199\u5386\u53f2 rebase\uff1a\u642c\u5bb6\u5230\u65b0\u697c\u5c42\uff0c\u4e0d\u662f\u5408\u5e76 - \u7f51\u7855\u4e92\u8054\u5e2e\u52a9\u4e2d\u5fc3\" \/>\n<meta property=\"og:description\" content=\"\u5199\u5728\u524d\u9762：\u8fd9\u4e00\u7ae0\u8981\u89e3\u51b3\u4ec0\u4e48 \u5982\u679c\u4f60\u5df2\u7ecf\u4f1a\u4e86\u5206\u652f\u548c\u5408\u5e76，\u5fc3\u91cc\u53ef\u80fd\u8fd8\u6709\u4e00\u4e2a\u66f4\u5177\u4f53\u7684\u56f0\u60d1：\u6bcf\u6b21 merge \u90fd\u4f1a\u591a\u51fa\u4e00\u4e2a\u5408\u5e76\u63d0\u4ea4，\u5206\u652f\u7ebf\u7f20\u6210\u4e00\u56e2\u3002 \u6709\u6ca1\u6709\u529e\u6cd5\u628a\u4ee3\u7801\u6539\u52a8\u300c\u7406\u6210\u4e00\u6761\u76f4\u7ebf\u300d？ \u5b66\u5b8c\u540e，\u4f60\u5e94\u8be5\u80fd： \u8bf4\u6e05\u695a rebase \u548c merge \u7684\u533a\u522b（\u7528\u300c\u642c\u5bb6\u300d\u7684\u6bd4\u55bb）\u7528 git rebase \u628a\u5206\u652f\u7ebf\u6574\u7406\u6210\u76f4\u7ebf\u7528 git rebase -i \u538b\u7f29\u3001\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.wsisp.com\/helps\/92768.html\" \/>\n<meta property=\"og:site_name\" content=\"\u7f51\u7855\u4e92\u8054\u5e2e\u52a9\u4e2d\u5fc3\" \/>\n<meta property=\"article:published_time\" content=\"2026-08-11T00:57:23+00:00\" \/>\n<meta property=\"og:image\" content=\"https:\/\/www.wsisp.com\/helps\/wp-content\/uploads\/2026\/08\/20260811005721-6a7a7371b3922.png\" \/>\n<meta name=\"author\" content=\"admin\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:label1\" content=\"\u4f5c\u8005\" \/>\n\t<meta name=\"twitter:data1\" content=\"admin\" \/>\n\t<meta name=\"twitter:label2\" content=\"\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4\" \/>\n\t<meta name=\"twitter:data2\" content=\"6 \u5206\" \/>\n<script type=\"application\/ld+json\" class=\"yoast-schema-graph\">{\"@context\":\"https:\/\/schema.org\",\"@graph\":[{\"@type\":\"WebPage\",\"@id\":\"https:\/\/www.wsisp.com\/helps\/92768.html\",\"url\":\"https:\/\/www.wsisp.com\/helps\/92768.html\",\"name\":\"16 \u2014 \u6539\u5199\u5386\u53f2 rebase\uff1a\u642c\u5bb6\u5230\u65b0\u697c\u5c42\uff0c\u4e0d\u662f\u5408\u5e76 - \u7f51\u7855\u4e92\u8054\u5e2e\u52a9\u4e2d\u5fc3\",\"isPartOf\":{\"@id\":\"https:\/\/www.wsisp.com\/helps\/#website\"},\"datePublished\":\"2026-08-11T00:57:23+00:00\",\"dateModified\":\"2026-08-11T00:57:23+00:00\",\"author\":{\"@id\":\"https:\/\/www.wsisp.com\/helps\/#\/schema\/person\/358e386c577a3ab51c4493330a20ad41\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.wsisp.com\/helps\/92768.html#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.wsisp.com\/helps\/92768.html\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.wsisp.com\/helps\/92768.html#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.wsisp.com\/helps\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"16 \u2014 \u6539\u5199\u5386\u53f2 rebase\uff1a\u642c\u5bb6\u5230\u65b0\u697c\u5c42\uff0c\u4e0d\u662f\u5408\u5e76\"}]},{\"@type\":\"WebSite\",\"@id\":\"https:\/\/www.wsisp.com\/helps\/#website\",\"url\":\"https:\/\/www.wsisp.com\/helps\/\",\"name\":\"\u7f51\u7855\u4e92\u8054\u5e2e\u52a9\u4e2d\u5fc3\",\"description\":\"\u9999\u6e2f\u670d\u52a1\u5668_\u9999\u6e2f\u4e91\u670d\u52a1\u5668\u8d44\u8baf_\u670d\u52a1\u5668\u5e2e\u52a9\u6587\u6863_\u670d\u52a1\u5668\u6559\u7a0b\",\"potentialAction\":[{\"@type\":\"SearchAction\",\"target\":{\"@type\":\"EntryPoint\",\"urlTemplate\":\"https:\/\/www.wsisp.com\/helps\/?s={search_term_string}\"},\"query-input\":\"required name=search_term_string\"}],\"inLanguage\":\"zh-Hans\"},{\"@type\":\"Person\",\"@id\":\"https:\/\/www.wsisp.com\/helps\/#\/schema\/person\/358e386c577a3ab51c4493330a20ad41\",\"name\":\"admin\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.wsisp.com\/helps\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/gravatar.wp-china-yes.net\/avatar\/?s=96&d=mystery\",\"contentUrl\":\"https:\/\/gravatar.wp-china-yes.net\/avatar\/?s=96&d=mystery\",\"caption\":\"admin\"},\"sameAs\":[\"http:\/\/wp.wsisp.com\"],\"url\":\"https:\/\/www.wsisp.com\/helps\/author\/admin\"}]}<\/script>\n<!-- \/ Yoast SEO plugin. -->","yoast_head_json":{"title":"16 \u2014 \u6539\u5199\u5386\u53f2 rebase\uff1a\u642c\u5bb6\u5230\u65b0\u697c\u5c42\uff0c\u4e0d\u662f\u5408\u5e76 - \u7f51\u7855\u4e92\u8054\u5e2e\u52a9\u4e2d\u5fc3","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:\/\/www.wsisp.com\/helps\/92768.html","og_locale":"zh_CN","og_type":"article","og_title":"16 \u2014 \u6539\u5199\u5386\u53f2 rebase\uff1a\u642c\u5bb6\u5230\u65b0\u697c\u5c42\uff0c\u4e0d\u662f\u5408\u5e76 - \u7f51\u7855\u4e92\u8054\u5e2e\u52a9\u4e2d\u5fc3","og_description":"\u5199\u5728\u524d\u9762：\u8fd9\u4e00\u7ae0\u8981\u89e3\u51b3\u4ec0\u4e48 \u5982\u679c\u4f60\u5df2\u7ecf\u4f1a\u4e86\u5206\u652f\u548c\u5408\u5e76，\u5fc3\u91cc\u53ef\u80fd\u8fd8\u6709\u4e00\u4e2a\u66f4\u5177\u4f53\u7684\u56f0\u60d1：\u6bcf\u6b21 merge \u90fd\u4f1a\u591a\u51fa\u4e00\u4e2a\u5408\u5e76\u63d0\u4ea4，\u5206\u652f\u7ebf\u7f20\u6210\u4e00\u56e2\u3002 \u6709\u6ca1\u6709\u529e\u6cd5\u628a\u4ee3\u7801\u6539\u52a8\u300c\u7406\u6210\u4e00\u6761\u76f4\u7ebf\u300d？ \u5b66\u5b8c\u540e，\u4f60\u5e94\u8be5\u80fd： \u8bf4\u6e05\u695a rebase \u548c merge \u7684\u533a\u522b（\u7528\u300c\u642c\u5bb6\u300d\u7684\u6bd4\u55bb）\u7528 git rebase \u628a\u5206\u652f\u7ebf\u6574\u7406\u6210\u76f4\u7ebf\u7528 git rebase -i \u538b\u7f29\u3001","og_url":"https:\/\/www.wsisp.com\/helps\/92768.html","og_site_name":"\u7f51\u7855\u4e92\u8054\u5e2e\u52a9\u4e2d\u5fc3","article_published_time":"2026-08-11T00:57:23+00:00","og_image":[{"url":"https:\/\/www.wsisp.com\/helps\/wp-content\/uploads\/2026\/08\/20260811005721-6a7a7371b3922.png"}],"author":"admin","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"admin","\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4":"6 \u5206"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"WebPage","@id":"https:\/\/www.wsisp.com\/helps\/92768.html","url":"https:\/\/www.wsisp.com\/helps\/92768.html","name":"16 \u2014 \u6539\u5199\u5386\u53f2 rebase\uff1a\u642c\u5bb6\u5230\u65b0\u697c\u5c42\uff0c\u4e0d\u662f\u5408\u5e76 - \u7f51\u7855\u4e92\u8054\u5e2e\u52a9\u4e2d\u5fc3","isPartOf":{"@id":"https:\/\/www.wsisp.com\/helps\/#website"},"datePublished":"2026-08-11T00:57:23+00:00","dateModified":"2026-08-11T00:57:23+00:00","author":{"@id":"https:\/\/www.wsisp.com\/helps\/#\/schema\/person\/358e386c577a3ab51c4493330a20ad41"},"breadcrumb":{"@id":"https:\/\/www.wsisp.com\/helps\/92768.html#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.wsisp.com\/helps\/92768.html"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.wsisp.com\/helps\/92768.html#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.wsisp.com\/helps"},{"@type":"ListItem","position":2,"name":"16 \u2014 \u6539\u5199\u5386\u53f2 rebase\uff1a\u642c\u5bb6\u5230\u65b0\u697c\u5c42\uff0c\u4e0d\u662f\u5408\u5e76"}]},{"@type":"WebSite","@id":"https:\/\/www.wsisp.com\/helps\/#website","url":"https:\/\/www.wsisp.com\/helps\/","name":"\u7f51\u7855\u4e92\u8054\u5e2e\u52a9\u4e2d\u5fc3","description":"\u9999\u6e2f\u670d\u52a1\u5668_\u9999\u6e2f\u4e91\u670d\u52a1\u5668\u8d44\u8baf_\u670d\u52a1\u5668\u5e2e\u52a9\u6587\u6863_\u670d\u52a1\u5668\u6559\u7a0b","potentialAction":[{"@type":"SearchAction","target":{"@type":"EntryPoint","urlTemplate":"https:\/\/www.wsisp.com\/helps\/?s={search_term_string}"},"query-input":"required name=search_term_string"}],"inLanguage":"zh-Hans"},{"@type":"Person","@id":"https:\/\/www.wsisp.com\/helps\/#\/schema\/person\/358e386c577a3ab51c4493330a20ad41","name":"admin","image":{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.wsisp.com\/helps\/#\/schema\/person\/image\/","url":"https:\/\/gravatar.wp-china-yes.net\/avatar\/?s=96&d=mystery","contentUrl":"https:\/\/gravatar.wp-china-yes.net\/avatar\/?s=96&d=mystery","caption":"admin"},"sameAs":["http:\/\/wp.wsisp.com"],"url":"https:\/\/www.wsisp.com\/helps\/author\/admin"}]}},"_links":{"self":[{"href":"https:\/\/www.wsisp.com\/helps\/wp-json\/wp\/v2\/posts\/92768","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.wsisp.com\/helps\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.wsisp.com\/helps\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.wsisp.com\/helps\/wp-json\/wp\/v2\/users\/2"}],"replies":[{"embeddable":true,"href":"https:\/\/www.wsisp.com\/helps\/wp-json\/wp\/v2\/comments?post=92768"}],"version-history":[{"count":0,"href":"https:\/\/www.wsisp.com\/helps\/wp-json\/wp\/v2\/posts\/92768\/revisions"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/www.wsisp.com\/helps\/wp-json\/wp\/v2\/media\/92766"}],"wp:attachment":[{"href":"https:\/\/www.wsisp.com\/helps\/wp-json\/wp\/v2\/media?parent=92768"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.wsisp.com\/helps\/wp-json\/wp\/v2\/categories?post=92768"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.wsisp.com\/helps\/wp-json\/wp\/v2\/tags?post=92768"},{"taxonomy":"topic","embeddable":true,"href":"https:\/\/www.wsisp.com\/helps\/wp-json\/wp\/v2\/topic?post=92768"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}