{"id":334,"date":"2024-12-19T13:44:05","date_gmt":"2024-12-19T05:44:05","guid":{"rendered":"http:\/\/106.12.148.75\/?p=334"},"modified":"2024-12-19T13:44:06","modified_gmt":"2024-12-19T05:44:06","slug":"%e3%80%90git%e3%80%91cherrypick%e6%95%99%e7%a8%8b","status":"publish","type":"post","link":"https:\/\/jamilblog.top\/?p=334","title":{"rendered":"\u3010Git\u3011cherrypick\u6559\u7a0b"},"content":{"rendered":"\n

git cherry-pick<\/code> \u662f\u4e00\u4e2a\u975e\u5e38\u6709\u7528\u7684 Git \u547d\u4ee4\uff0c\u7528\u6765\u4ece\u67d0\u4e2a\u5206\u652f\u4e2d\u9009\u62e9\u7279\u5b9a\u7684\u63d0\u4ea4\uff0c\u5e76\u5c06\u8fd9\u4e9b\u63d0\u4ea4\u5e94\u7528\u5230\u5f53\u524d\u5206\u652f\u3002\u4e0e git merge<\/code> \u548c git rebase<\/code> \u4e0d\u540c\uff0cgit cherry-pick<\/code> \u53ea\u4f1a\u9009\u62e9\u6307\u5b9a\u7684\u63d0\u4ea4\uff0c\u800c\u4e0d\u4f1a\u5c06\u6574\u4e2a\u5206\u652f\u7684\u5386\u53f2\u8fc1\u79fb\u3002<\/p>\n\n\n\n

\n\n\n\n

\u9002\u7528\u573a\u666f<\/strong><\/h3>\n\n\n\n
    \n
  1. \u9700\u8981\u8fc1\u79fb\u5355\u4e2a\u6216\u591a\u4e2a\u7279\u5b9a\u6539\u52a8\u5230\u53e6\u4e00\u4e2a\u5206\u652f<\/strong>\u3002<\/li>\n\n\n\n
  2. \u4fee\u590d\u7279\u5b9a\u7684 Bug \u5e76\u5c06\u4fee\u590d\u63d0\u4ea4\u8fc1\u79fb\u5230\u591a\u4e2a\u5206\u652f<\/strong>\u3002<\/li>\n\n\n\n
  3. \u4ece\u5b9e\u9a8c\u6027\u5206\u652f\u63d0\u53d6\u67d0\u4e9b\u7a33\u5b9a\u7684\u529f\u80fd\u5230\u4e3b\u5206\u652f<\/strong>\u3002<\/li>\n<\/ol>\n\n\n\n
    \n\n\n\n

    git cherry-pick<\/code> \u7684\u57fa\u672c\u7528\u6cd5<\/strong><\/h3>\n\n\n\n

    1. \u57fa\u672c\u8bed\u6cd5<\/strong><\/h4>\n\n\n\n
    Bash<\/span><\/path><\/path><\/svg><\/span>
    git<\/span> <\/span>cherry-pick<\/span> <\/span><<\/span>commit-has<\/span>h<\/span>><\/span><\/span><\/code><\/pre><\/div>\n\n\n\n
    \n<\/code><\/pre>\n\n\n\n
    \u5176\u4e2d <commit-hash><\/code> \u662f\u8981\u8fc1\u79fb\u7684\u63d0\u4ea4\u7684\u54c8\u5e0c\u503c\u3002<\/p>\n\n\n\n
    \n\n\n\n
    2. \u793a\u4f8b<\/strong><\/h4>\n\n\n\n
    \u573a\u666f 1\uff1a\u5c06\u5355\u4e2a\u63d0\u4ea4\u8fc1\u79fb\u5230\u53e6\u4e00\u4e2a\u5206\u652f<\/strong><\/h5>\n\n\n\n
      \n
    1. \u67e5\u770b\u5f53\u524d\u5206\u652f\u7684\u63d0\u4ea4\u5386\u53f2\uff1a git log --oneline<\/code> \u5047\u8bbe\u8f93\u51fa\u5982\u4e0b\uff1a a1b2c3e Fix login bug d4e5f6a Add new feature 9f8e7d6 Initial commit<\/code><\/li>\n\n\n\n
    2. \u5047\u8bbe\u4f60\u60f3\u5c06 a1b2c3e<\/code> \u7684\u63d0\u4ea4\u8fc1\u79fb\u5230\u5206\u652f main<\/code>\uff0c\u53ef\u4ee5\u6267\u884c\u4ee5\u4e0b\u64cd\u4f5c\uff1a git checkout main git cherry-pick a1b2c3e<\/code><\/li>\n\n\n\n
    3. main<\/code> \u5206\u652f\u73b0\u5728\u5c31\u4f1a\u5305\u542b a1b2c3e<\/code> \u7684\u6539\u52a8\u3002<\/li>\n<\/ol>\n\n\n\n
      \n\n\n\n
      \u573a\u666f 2\uff1a\u5c06\u591a\u4e2a\u63d0\u4ea4\u8fc1\u79fb\u5230\u53e6\u4e00\u4e2a\u5206\u652f<\/strong><\/h5>\n\n\n\n
        \n
      1. \u5047\u8bbe\u4f60\u60f3\u8fc1\u79fb\u4e24\u4e2a\u63d0\u4ea4 a1b2c3e<\/code> \u548c d4e5f6a<\/code>\uff0c\u53ef\u4ee5\u4e00\u6b21\u6027\u8fc1\u79fb\u591a\u4e2a\u63d0\u4ea4\uff1a git cherry-pick a1b2c3e d4e5f6a<\/code><\/li>\n\n\n\n
      2. \u5982\u679c\u60f3\u8fc1\u79fb\u4e00\u6bb5\u8fde\u7eed\u7684\u63d0\u4ea4\uff0c\u53ef\u4ee5\u7528\u63d0\u4ea4\u8303\u56f4\uff1a git cherry-pick a1b2c3e..d4e5f6a<\/code> \u6ce8\u610f\uff0c\u8303\u56f4\u8bed\u6cd5\u4f1a\u5305\u542b a1b2c3e<\/code> \u7684\u540e\u4e00\u4e2a\u63d0\u4ea4\u5230 d4e5f6a<\/code>\u3002<\/li>\n<\/ol>\n\n\n\n
        \n\n\n\n
        3. \u5904\u7406\u51b2\u7a81<\/strong><\/h4>\n\n\n\n
        \u5f53 cherry-pick \u64cd\u4f5c\u9047\u5230\u51b2\u7a81\u65f6\uff1a<\/p>\n\n\n\n
          \n
        1. Git \u4f1a\u63d0\u793a\u51b2\u7a81\u6587\u4ef6\uff0c\u5e76\u6682\u505c cherry-pick\uff1a CONFLICT (content): Merge conflict in file.txt<\/code><\/li>\n\n\n\n
        2. \u624b\u52a8\u89e3\u51b3\u51b2\u7a81\u540e\uff0c\u6807\u8bb0\u6587\u4ef6\u4e3a\u5df2\u89e3\u51b3\uff1a git add file.txt<\/code><\/li>\n\n\n\n
        3. \u7ee7\u7eed cherry-pick\uff1a git cherry-pick --continue<\/code><\/li>\n\n\n\n
        4. \u5982\u679c\u60f3\u653e\u5f03\u5f53\u524d cherry-pick\uff1a git cherry-pick --abort<\/code><\/li>\n<\/ol>\n\n\n\n
          \n\n\n\n
          \u9ad8\u7ea7\u7528\u6cd5<\/strong><\/h3>\n\n\n\n
          1. \u4f7f\u7528 --no-commit<\/code><\/strong><\/h4>\n\n\n\n
          \u9ed8\u8ba4\u60c5\u51b5\u4e0b\uff0cgit cherry-pick<\/code> \u4f1a\u5728\u8fc1\u79fb\u6539\u52a8\u540e\u81ea\u52a8\u63d0\u4ea4\u3002\u5982\u679c\u4f60\u53ea\u60f3\u8fc1\u79fb\u6539\u52a8\u4f46\u4e0d\u63d0\u4ea4\uff0c\u53ef\u4ee5\u4f7f\u7528 --no-commit<\/code>\uff1a<\/p>\n\n\n\n
          Bash<\/span><\/path><\/path><\/svg><\/span>
          git<\/span> <\/span>cherry-pick<\/span> <\/span><<\/span>commit-has<\/span>h<\/span>><\/span> <\/span>--no-commit<\/span><\/span><\/code><\/pre><\/div>\n\n\n\n


          \u6539\u52a8\u4f1a\u88ab\u4fdd\u7559\u5728\u6682\u5b58\u533a\uff0c\u5141\u8bb8\u4f60\u624b\u52a8\u4fee\u6539\u540e\u518d\u63d0\u4ea4\u3002<\/code><\/pre>\n\n\n\n
          \n\n\n\n
          2. \u4f7f\u7528 -x<\/code><\/strong><\/h4>\n\n\n\n
          \u5728\u5408\u5e76\u63d0\u4ea4\u4fe1\u606f\u65f6\uff0c-x<\/code> \u4f1a\u5728\u63d0\u4ea4\u4fe1\u606f\u4e2d\u6dfb\u52a0\u539f\u59cb\u63d0\u4ea4\u7684\u5f15\u7528\uff08\u65b9\u4fbf\u8ffd\u6eaf\u5386\u53f2\uff09\uff1a<\/p>\n\n\n\n
          Bash<\/span><\/path><\/path><\/svg><\/span>
          git<\/span> <\/span>cherry-pick<\/span> <\/span><<\/span>commit-has<\/span>h<\/span>><\/span> <\/span>-x<\/span><\/span><\/code><\/pre><\/div>\n\n\n\n


          \u63d0\u4ea4\u4fe1\u606f\u5c06\u5305\u542b\uff1a<\/code><\/pre>\n\n\n\n
          (cherry picked from commit <commit-hash>)\n<\/code><\/pre>\n\n\n\n
          \n\n\n\n
          3. \u5ffd\u7565\u7a7a\u63d0\u4ea4<\/strong><\/h4>\n\n\n\n
          \u5f53 cherry-pick \u7684\u63d0\u4ea4\u5df2\u7ecf\u5305\u542b\u5728\u5f53\u524d\u5206\u652f\u65f6\uff0cGit \u4f1a\u63d0\u793a \u201c\u7a7a\u63d0\u4ea4\u201d\u3002\u4f60\u53ef\u4ee5\u4f7f\u7528 --allow-empty<\/code> \u6765\u4fdd\u7559\u7a7a\u63d0\u4ea4\uff0c\u6216\u8005\u4f7f\u7528 --skip<\/code> \u8df3\u8fc7\uff1a<\/p>\n\n\n\n
          Bash<\/span><\/path><\/path><\/svg><\/span>
          git<\/span> <\/span>cherry-pick<\/span> <\/span>--skip<\/span><\/span><\/code><\/pre><\/div>\n\n\n\n
          \n<\/code><\/pre>\n\n\n\n
          \n\n\n\n
          4. \u5e94\u7528\u591a\u4e2a\u63d0\u4ea4\u6587\u4ef6\u4f46\u4e0d\u4f9d\u8d56\u63d0\u4ea4\u5386\u53f2<\/strong><\/h4>\n\n\n\n
          \u5982\u679c\u53ea\u60f3\u8fc1\u79fb\u4ee3\u7801\u6539\u52a8\uff0c\u800c\u4e0d\u4fdd\u7559\u63d0\u4ea4\u5386\u53f2\uff0c\u53ef\u4ee5\u7528\u4ee5\u4e0b\u6b65\u9aa4\uff1a<\/p>\n\n\n\n
            \n
          1. \u521b\u5efa\u8865\u4e01\uff1a git format-patch -1 <commit-hash><\/code><\/li>\n\n\n\n
          2. \u5728\u76ee\u6807\u5206\u652f\u5e94\u7528\u8865\u4e01\uff1a git apply <patch-file><\/code><\/li>\n<\/ol>\n\n\n\n
            \n\n\n\n
            \u6ce8\u610f\u4e8b\u9879<\/strong><\/h3>\n\n\n\n
              \n
            1. git cherry-pick<\/code> \u4f1a\u521b\u5efa\u4e00\u4e2a\u65b0\u7684\u63d0\u4ea4<\/strong>\uff1a \u5373\u4f7f\u662f\u76f8\u540c\u7684\u6539\u52a8\uff0c\u5728\u76ee\u6807\u5206\u652f\u4e0a\u4f1a\u751f\u6210\u65b0\u7684\u63d0\u4ea4\u54c8\u5e0c\u3002<\/li>\n\n\n\n
            2. \u8fc1\u79fb\u7684\u6539\u52a8\u4f1a\u7834\u574f\u5206\u652f\u7684\u7ebf\u6027\u5386\u53f2<\/strong>\uff1a \u5982\u679c\u4f60\u9700\u8981\u4fdd\u6301\u7ebf\u6027\u5386\u53f2\uff0c\u8003\u8651\u4f7f\u7528 git rebase<\/code> \u6216 git merge<\/code>\u3002<\/li>\n\n\n\n
            3. \u51b2\u7a81\u5904\u7406\u65f6\u9700\u8c28\u614e<\/strong>\uff1a \u5982\u679c\u591a\u4e2a\u63d0\u4ea4\u76f8\u4e92\u4f9d\u8d56\uff0c\u5148 cherry-pick \u7684\u63d0\u4ea4\u53ef\u80fd\u5bfc\u81f4\u51b2\u7a81\uff0c\u9700\u6309\u987a\u5e8f\u5904\u7406\u3002<\/li>\n<\/ol>\n\n\n\n
              \n\n\n\n
              \u603b\u7ed3<\/strong><\/h3>\n\n\n\n
              git cherry-pick<\/code> \u662f\u4e00\u79cd\u7075\u6d3b\u4e14\u5f3a\u5927\u7684\u5de5\u5177\uff0c\u9002\u5408\u4ece\u5206\u652f\u4e2d\u63d0\u53d6\u7279\u5b9a\u6539\u52a8\u3002\u5728\u4f7f\u7528\u524d\uff0c\u786e\u4fdd\u7406\u89e3\u63d0\u4ea4\u4f9d\u8d56\u5173\u7cfb\uff0c\u5904\u7406\u51b2\u7a81\u65f6\u4e5f\u9700\u4ed4\u7ec6\u68c0\u67e5\u3002\u5982\u679c\u4f60\u7684\u573a\u666f\u662f\u8fc1\u79fb\u591a\u4e2a\u76f8\u5173\u6539\u52a8\uff0c\u53ef\u4ee5\u8003\u8651 git merge<\/code> \u6216 git rebase<\/code> \u4f5c\u4e3a\u66ff\u4ee3\u65b9\u6848\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"
              git cherry-pick \u662f\u4e00\u4e2a\u975e\u5e38\u6709\u7528\u7684 Git \u547d\u4ee4\uff0c\u7528\u6765\u4ece\u67d0\u4e2a\u5206\u652f\u4e2d\u9009\u62e9\u7279\u5b9a\u7684\u63d0\u4ea4\uff0c\u5e76\u5c06\u8fd9\u4e9b\u63d0\u4ea4\u5e94\u7528\u5230\u5f53\u524d\u5206\u652f\u3002\u4e0e g …<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"emotion":"","emotion_color":"","title_style":"","license":"","footnotes":""},"categories":[29,5],"tags":[31,30,32],"class_list":["post-334","post","type-post","status-publish","format-standard","hentry","category-git","category-tools","tag-cherrypick","tag-git"],"_links":{"self":[{"href":"https:\/\/jamilblog.top\/index.php?rest_route=\/wp\/v2\/posts\/334","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/jamilblog.top\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/jamilblog.top\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/jamilblog.top\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/jamilblog.top\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=334"}],"version-history":[{"count":1,"href":"https:\/\/jamilblog.top\/index.php?rest_route=\/wp\/v2\/posts\/334\/revisions"}],"predecessor-version":[{"id":335,"href":"https:\/\/jamilblog.top\/index.php?rest_route=\/wp\/v2\/posts\/334\/revisions\/335"}],"wp:attachment":[{"href":"https:\/\/jamilblog.top\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=334"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/jamilblog.top\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=334"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/jamilblog.top\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=334"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}