{"id":12637,"date":"2023-09-08T08:55:23","date_gmt":"2023-09-08T00:55:23","guid":{"rendered":"https:\/\/92it.top\/?p=12637"},"modified":"2023-09-08T08:55:23","modified_gmt":"2023-09-08T00:55:23","slug":"git-cherry-pick%e8%af%a6%e8%a7%a3","status":"publish","type":"post","link":"https:\/\/92it.top\/?p=12637","title":{"rendered":"Git Cherry Pick\u8be6\u89e3"},"content":{"rendered":"\n

1. \u7b80\u4ecb<\/strong><\/p>\n\n\n\n

\n\n\n\n

Git\u662f\u4e00\u6b3e\u5206\u5e03\u5f0f\u7248\u672c\u63a7\u5236\u7cfb\u7edf\uff0c\u5b83\u63d0\u4f9b\u4e86\u8bb8\u591a\u5f3a\u5927\u7684\u529f\u80fd\u6765\u7ba1\u7406\u4ee3\u7801\u7684\u7248\u672c\u548c\u53d8\u66f4\u3002\u5176\u4e2d\u4e4b\u4e00\u5c31\u662fcherry-pick\u547d\u4ee4\uff0c\u5b83\u5141\u8bb8\u6211\u4eec\u9009\u62e9\u67d0\u4e2a\u5206\u652f\u4e0a\u7684\u4e00\u4e2a\u6216\u591a\u4e2a\u63d0\u4ea4\uff0c\u5e76\u5c06\u5b83\u4eec\u5e94\u7528\u5230\u5f53\u524d\u5206\u652f\u4e0a\u3002\u8fd9\u4e2a\u529f\u80fd\u975e\u5e38\u6709\u7528\uff0c\u53ef\u4ee5\u5e2e\u52a9\u6211\u4eec\u5728\u4e0d\u5408\u5e76\u6574\u4e2a\u5206\u652f\u7684\u60c5\u51b5\u4e0b\uff0c\u5c06\u7279\u5b9a\u7684\u63d0\u4ea4\u5e94\u7528\u5230\u5176\u4ed6\u5206\u652f\u4e0a\u3002\u672c\u7bc7\u535a\u5ba2\u5c06\u8be6\u7ec6\u4ecb\u7ecdcherry-pick\u547d\u4ee4\u7684\u4f7f\u7528\u65b9\u6cd5\u548c\u793a\u4f8b\u3002<\/p>\n\n\n\n

2.\u00a0cherry-pick<\/code>\u547d\u4ee4\u7684\u57fa\u672c\u7528\u6cd5<\/strong><\/p>\n\n\n\n

\n\n\n\n


cherry-pick<\/code>\u547d\u4ee4\u7684\u57fa\u672c\u8bed\u6cd5\u5982\u4e0b\uff1a<\/p>\n\n\n\n

git cherry-pick <commit><\/pre>\n\n\n\n
\u5176\u4e2d\uff0c<commit><\/code>\u662f\u8981\u5e94\u7528\u7684\u63d0\u4ea4\u7684\u54c8\u5e0c\u503c\u6216\u5206\u652f\u540d\u3002\u8be5\u547d\u4ee4\u4f1a\u5c06\u6307\u5b9a\u7684\u63d0\u4ea4\u5e94\u7528\u5230\u5f53\u524d\u5206\u652f\u4e0a\uff0c\u5e76\u521b\u5efa\u4e00\u4e2a\u65b0\u7684\u63d0\u4ea4\u3002<\/p>\n\n\n\n
3.\u00a0cherry-pick<\/code>\u7684\u4f7f\u7528\u573a\u666f<\/strong><\/p>\n\n\n\n
\n\n\n\n
cherry-pick<\/code>\u547d\u4ee4\u5e38\u7528\u4e8e\u4ee5\u4e0b\u573a\u666f\uff1a<\/p>\n\n\n\n
  • \u5408\u5e76\u5355\u4e2a\u63d0\u4ea4\uff1a\u5f53\u6211\u4eec\u53ea\u60f3\u5e94\u7528\u67d0\u4e2a\u5206\u652f\u4e0a\u7684\u4e00\u4e2a\u63d0\u4ea4\u5230\u5f53\u524d\u5206\u652f\u65f6\uff0c\u53ef\u4ee5\u4f7f\u7528cherry-pick\u547d\u4ee4\uff0c\u800c\u4e0d\u9700\u8981\u5408\u5e76\u6574\u4e2a\u5206\u652f\u3002<\/li>
  • \u4fee\u590dbug\uff1a\u5f53\u6211\u4eec\u5728\u4e00\u4e2a\u5206\u652f\u4e0a\u4fee\u590d\u4e86\u4e00\u4e2abug\uff0c\u5e76\u5e0c\u671b\u5c06\u8fd9\u4e2a\u4fee\u590d\u5e94\u7528\u5230\u5176\u4ed6\u5206\u652f\u4e0a\u65f6\uff0c\u53ef\u4ee5\u4f7f\u7528cherry-pick\u547d\u4ee4\u3002<\/li>
  • \u63d0\u53d6\u7279\u5b9a\u529f\u80fd\uff1a\u5f53\u6211\u4eec\u5728\u4e00\u4e2a\u5206\u652f\u4e0a\u5f00\u53d1\u4e86\u4e00\u4e2a\u65b0\u529f\u80fd\uff0c\u5e76\u5e0c\u671b\u5c06\u8be5\u529f\u80fd\u5e94\u7528\u5230\u5176\u4ed6\u5206\u652f\u4e0a\u65f6\uff0c\u53ef\u4ee5\u4f7f\u7528cherry-pick\u547d\u4ee4\u3002<\/li><\/ul>\n\n\n\n
    4.\u00a0cherry-pick<\/code>\u7684\u793a\u4f8b<\/strong><\/p>\n\n\n\n
    \n\n\n\n
    \u5728\u591a\u5206\u652f\u5f00\u53d1\u7684\u65f6\u5019\u4f1a\u6709\u9700\u8981\u628a\u4e00\u4e2a\u5206\u652f\u7684\u90e8\u5206commit\u5e94\u7528\u5230\u5176\u4ed6\u7684\u5206\u652f\u4e0a\uff0c\u7136\u800cgit merge<\/code>\u4f1a\u628a\u4e00\u4e2a\u5206\u652f\u7684commits\u90fd\u5e94\u7528\u5230\u5f53\u524d\u5206\u652f\uff0c\u8fd9\u65f6\u5019\u6211\u4eec\u53ef\u4ee5\u4f7f\u7528git cherry-pick<\/code>\u6765\u5b8c\u6210\u8fd9\u4e00\u64cd\u4f5c\uff0c\u5b83\u7684\u4f5c\u7528\u662f\u9009\u62e9\u5df2\u5b58\u5728\u7684commit\u5e94\u7528\u5230\u5f53\u524d\u5206\u652f\u4e0a\uff0c\u5e76\u4ea7\u751f\u65b0\u7684commit SHA-1 \u6821\u9a8c\u548c\u3002<\/p>\n\n\n\n
    \u4e0b\u9762\u662f\u8fd9\u4e2a\u547d\u4ee4\u7684\u56fe\u89e3\u793a\u4f8b\u3002<\/p>\n\n\n\n
    \u56fe\u89e3\u793a\u4f8b<\/p>\n\n\n\n
    \u5982\u4e0b\u6709\u4e24\u4e2a\u5206\u652fmaster<\/code>\u548cdev<\/code>\uff0c\u4eceC2<\/code>\u5f00\u59cb\u4e24\u4e2a\u5206\u652f\u5f00\u59cb\u6709\u4e0d\u540c\u7684commits\u3002<\/p>\n\n\n\n
    \"\"<\/figure><\/div>\n\n\n\n
    \u9700\u8981\u628adev<\/code>\u7684C6<\/code>\u5408\u5e76\u5230master<\/code>\uff0c\u53ea\u9700\u5728master<\/code>\u5206\u652f\u4e0a\u6267\u884cgit cherry-pick C6<\/code>\uff0c\u5c31\u4f1a\u628adev<\/code>\u5206\u652f\u7684C6<\/code>\u5e94\u7528\u5230master<\/code>\u5206\u652f\u4e0a\u5e76\u4ea7\u751f\u4e00\u4e2a\u65b0\u7684commitC6'<\/code>\u3002<\/p>\n\n\n\n
    \"\"<\/figure><\/div>\n\n\n\n
    \u5982\u679c\u8981\u5408\u5e76\u591a\u4e2acommits\uff0c\u6bd4\u5982C7<\/code>\u548cC8<\/code>\u4e24\u4e2acommits\uff0c\u53ef\u4ee5\u6267\u884cgit cherry-pick C7 C8<\/code>\uff0c\u5219git\u63d0\u4ea4\u8bb0\u5f55\u5c31\u4f1a\u53d8\u6210\u4e0b\u9762\u8fd9\u6837\u3002<\/p>\n\n\n\n
    \"\"<\/figure><\/div>\n\n\n\n
    \u9700\u8981\u6ce8\u610f\u7684\u662f\uff0c\u65b0\u7684commit SHA-1 \u6821\u9a8c\u548c\u4f1a\u548c\u539f\u6765\u7684commit SHA-1 \u6821\u9a8c\u548c\u4e0d\u4e00\u6837\u3002<\/p>\n\n\n\n
    \u4e0b\u9762\u6211\u4eec\u6765\u52a8\u624b\u611f\u53d7\u4e00\u4e0b\u3002\u5148\u51c6\u5907\u4e00\u4e0bgit\u7684\u63d0\u4ea4\u8bb0\u5f55\uff0c\u793a\u4f8b\u5982\u4e0b\u56fe\uff1a<\/p>\n\n\n\n
    \"\"<\/figure><\/div>\n\n\n\n
    \u8fd9\u4e2a\u65f6\u5019master<\/code>\u5206\u652f\u6709C1\uff0cC2\uff0cC3\uff0cC4\u6587\u4ef6\uff0cdev<\/code>\u5206\u652f\u6709C1\uff0cC2\uff0cC5\uff0cC6\uff0cC7\uff0cC8\uff0cC9\u6587\u4ef6\u3002<\/p>\n\n\n\n
    \"\"<\/figure><\/div>\n\n\n\n
    \u63a5\u4e0b\u6765\u6211\u4eec\u628adev<\/code>\u5206\u652f\u7684\u4e00\u4e9bcommits\u5e94\u7528\u5230master<\/code>\u5206\u652f\uff1a<\/p>\n\n\n\n
    • \u6839\u636e\u4e4b\u524d\u7684\u7ec8\u7aef\u8bb0\u5f55\u6216\u8005\u901a\u8fc7git log dev<\/code>\u67e5\u770bC6<\/code>\u7684 SHA-1 \u6821\u9a8c\u548c\u662ffca3793<\/code>\uff0c\u5728master<\/code>\u5206\u652f\u4e0a\u6267\u884cgit cherry-pick fca3793<\/code>\uff0c\u53ef\u4ee5\u770b\u5230\u65b0\u589e\u4e86\u4e00\u4e2a SHA-1 \u6821\u9a8c\u548c\u4e3a50982a2<\/code>\u7684commit\u5e76\u4e14\u5728master<\/code>\u5206\u652f\u4e0a\u591a\u4e86\u4e00\u4e2aC6\u6587\u4ef6\u3002<\/li>
    • \u6267\u884cgit cherry-pick d67e9f6 7bf5e7d<\/code>\u4e4b\u540e\uff0cmaster<\/code>\u5206\u652f\u53c8\u591a\u4e86C7\uff0cC8\u4e24\u4e2a\u6587\u4ef6\u3002<\/li><\/ul>\n\n\n\n
      \u5176\u4ed6\u7528\u6cd5<\/strong><\/p>\n\n\n\n
      • \u5982\u679c\u60f3\u5e94\u7528\u8fde\u7eed\u7684\u591a\u4e2acommits\u8fd8\u53ef\u4ee5\u4f7f\u7528git cherry-pick commit1..commitn<\/code>\uff0c\u5e94\u7528 SHA-1 \u6821\u9a8c\u548c\u4ececommit1<\/code>\u5230commitn<\/code>\u7684commits\uff0c\u6ce8\u610f\u8fd9\u91cc\u5e76\u4e0d\u5305\u542bcommit1<\/code>\uff0c\u5982\u679c\u9700\u8981\u5305\u542b\u53ef\u4ee5\u6267\u884cgit cherry-pick commit1^..commitn<\/code><\/strong>\u3002<\/li>
      • \u5982\u679c\u53ea\u60f3\u628a\u67d0\u4e00\u4e2a\u5206\u652f\u6700\u540e\u4e00\u4e2acommit\u5e94\u7528\u5230\u5f53\u524d\u5206\u652f\uff0c\u53ef\u4ee5\u76f4\u63a5\u4f7f\u7528git cherry-pick branch-name<\/code>\uff0c\u8fd9\u4e2a\u547d\u4ee4\u7684\u6548\u679c\u662f\uff0c\u5c06branch-name<\/code>\u5206\u652f\u6700\u540e\u4e00\u4e2acommit\u5e94\u7528\u5230\u5f53\u524d\u5206\u652f\u3002<\/li>
      • \u5f53\u7136\u5b9e\u9645\u4f7f\u7528\u8fc7\u7a0b\u4e2d\uff0c\u4f7f\u7528cherry-pick<\/code>\u53ef\u80fd\u4f1a\u51fa\u73b0\u51b2\u7a81\uff0c\u4f8b\u5982\u63d0\u793a\u5982\u4e0b\uff1a<\/li><\/ul>\n\n\n\n
        \"\"<\/figure><\/div>\n\n\n\n
        \u89e3\u51b3\u51b2\u7a81\u518d\u6267\u884cgit add <paths><\/code>\u5c06\u6587\u4ef6\u6807\u8bb0\u4e3a\u4ee5\u89e3\u51b3\u51b2\u7a81\uff0c\u6216\u8005\u6267\u884cgit rm <paths><\/code>\u76f4\u63a5\u4ece\u6682\u5b58\u533a\u548c\u5de5\u4f5c\u533a\u5220\u9664\u6587\u4ef6\uff0c\u6700\u540e\u6267\u884cgit cherry-pick --continue<\/code>\uff0c\u5219\u5b8c\u6210\u8fd9\u6b21cherry-pick<\/code>\u3002<\/p>\n\n\n\n
        \u5982\u679c\u60f3\u8981\u53d6\u6d88\u8fd9\u6b21\u7684cherry-pick<\/code>\u64cd\u4f5c\u53ef\u4ee5\u6267\u884cgit cherry-pick --abort<\/code><\/p>\n\n\n\n
        \u9644\uff1aCherry Pick \u548c merge\uff0c rebase\u7684\u533a\u522b<\/strong><\/p>\n\n\n\n
        \n\n\n\n
        GIT\u5206\u652f\u673a\u6784\u6982\u8ff0<\/strong><\/p>\n\n\n\n
        \u5728GIT\u4e2d\uff0c\u6bcf\u4e2a\u63d0\u4ea4\u90fd\u77e5\u9053\u5176\u7236\u7ea7\u3002\u56e0\u6b64\uff0c\u60a8\u7684GIT\u63d0\u4ea4\u5217\u8868\u662f\u4e00\u4e2a\u5355\u5411\u94fe\u63a5\u5217\u8868\uff0c\u4ee3\u8868\u4e86\u63d0\u4ea4\u7684\u987a\u5e8f\u3002\u9ed8\u8ba4\u60c5\u51b5\u4e0b\uff0c\u60a8\u6b63\u5728\u4f7f\u7528\u4e00\u4e2a\u540d\u4e3amaster\u7684\u5206\u652f\u3002\u5206\u652f\u59cb\u7ec8\u5b58\u50a8\u4e3a\u7b80\u5355\u7684\u54c8\u5e0cID\uff0c\u8fd9\u662f\u5206\u652f\u4e0a\u6700\u65b0\u63d0\u4ea4\u7684\u54c8\u5e0cID\u3002\u60a8\u53ef\u4ee5\u968f\u65f6\u901a\u8fc7git branch branch_name\u547d\u4ee4\u57fa\u4e8e\u5f53\u524dHEAD\u63d0\u4ea4\u542f\u52a8\u65b0\u5206\u652f\u3002\u8be5\u547d\u4ee4\u521b\u5efa\u4e00\u4e2a\u65b0\u5206\u652f\uff0c\u6307\u5411\u5f53\u524d\u63d0\u4ea4\u3002\u7136\u540e\u60a8\u53ef\u4ee5\u901a\u8fc7git checkout branch_name\u66f4\u6539\u5230\u8be5\u5206\u652f\u3002\u8fd9\u4f1a\u5c06\u60a8\u7684HEAD\u66f4\u6539\u4e3a\u60a8\u7684\u5206\u652f\u3002\u6216\u8005\uff0c\u60a8\u53ef\u4ee5\u901a\u8fc7\u952e\u5165git checkout -b branch_name\u4e00\u8d77\u6267\u884c\u8fd9\u4e9b\u6b65\u9aa4\u3002<\/p>\n\n\n\n
        \u5728\u5206\u652f\u4e0a\uff0c\u60a8\u53ef\u4ee5\u72ec\u7acb\u4e8e\u4e3b\u5206\u652f\u5de5\u4f5c\u3002\u60a8\u53ef\u4ee5\u5b9e\u73b0\u65b0\u529f\u80fd\uff0c\u4fee\u590d\u9519\u8bef\u6216\u8fdb\u884c\u4e00\u4e9b\u91cd\u6784\u3002\u540c\u65f6\uff0c\u5176\u4ed6\u4eba\u5728master\u5206\u652f\u6216\u5176\u4ed6\u4e00\u4e9b\u5206\u652f\u4e0a\u5de5\u4f5c\u3002\u5728\u5f00\u59cb\u4f7f\u7528\u529f\u80fd\u4e4b\u524d\uff0c\u65b0\u529f\u80fd\u5c06\u6dfb\u52a0\u5230master\u5206\u652f\u4e2d\u3002\u6b64\u65f6\uff0c\u60a8\u5fc5\u987b\u521b\u5efa\u4e00\u4e2a\u7248\u672c\uff0c\u5176\u4e2d\u5305\u542b\u5f53\u524d\u4e3b\u7248\u672c\u7684\u6240\u6709\u5185\u5bb9\u4ee5\u53ca\u5206\u652f\u4e2d\u7684\u66f4\u6539\u3002\u6709\u4e09\u79cd\u65b9\u6cd5\u53ef\u4ee5\u505a\u5230\u8fd9\u4e00\u70b9\u3002\u8ba9\u6211\u4eec\u770b\u770b\u7ec6\u8282\u3002<\/p>\n\n\n\n
        Merge<\/strong><\/p>\n\n\n\n
        \u7b2c\u4e00\u79cd\u975e\u5e38\u7ecf\u5178\u7684\u65b9\u6cd5\u662fgit merge\u3002\u5728master\u5206\u652f\u4e0a\uff08\u60a8\u59cb\u7ec8\u53ef\u4ee5\u901a\u8fc7\u8f93\u5165git branch\u6765\u68c0\u67e5\u5f53\u524d\u5206\u652f\uff09\uff0c\u952e\u5165git merge your_branch\u3002\u6b64\u547d\u4ee4\u5c06\u521b\u5efa\u5bf9master\u5206\u652f\u7684\u65b0\u5408\u5e76\u63d0\u4ea4\u3002<\/p>\n\n\n\n
        \u4ec0\u4e48\u662f\u5408\u5e76\u63d0\u4ea4\uff1f<\/strong><\/p>\n\n\n\n
        \u5728GIT\u4e2d\uff0c\u6bcf\u4e2a\u63d0\u4ea4\u53ea\u6709\u4e00\u4e2a\u7236\u63d0\u4ea4\uff0c\u4f46\u5408\u5e76\u63d0\u4ea4\u6709\u4e24\u4e2a\u751a\u81f3\u66f4\u591a\u4e2a\u7236\u63d0\u4ea4\u3002git merge master\u547d\u4ee4\u521b\u5efa\u4e00\u4e2a\u5177\u6709\u4e24\u4e2a\u7236\u7ea7\u7684\u5408\u5e76\u63d0\u4ea4\uff1a\u5206\u652f\u7684\u6700\u540e\u4e00\u6b21\u63d0\u4ea4\u548cmaster\u7684\u6700\u540e\u4e00\u6b21\u63d0\u4ea4\u3002\u8fd9\u6837\uff0c\u901a\u8fc7\u7b7e\u51fa\u6b64\u63d0\u4ea4\uff0c\u60a8\u5c06\u5728\u4e3b\u6570\u636e\u5e93\u548c\u5206\u652f\u673a\u6784\u4e0a\u90fd\u62e5\u6709\u66f4\u6539\u3002\u5728\u5408\u5e76\u671f\u95f4\uff0c\u5982\u679c\u5728\u4e24\u4e2a\u5206\u652f\u4e0a\u4fee\u6539\u4e86\u76f8\u540c\u7684\u884c\uff0c\u5219\u53ef\u80fd\u4f1a\u51fa\u73b0\u51b2\u7a81\u3002\u5728\u8fd9\u79cd\u60c5\u51b5\u4e0b\uff0c\u5fc5\u987b\u624b\u52a8\u89e3\u51b3\u8fd9\u4e9b\u51b2\u7a81\u3002<\/p>\n\n\n\n
        \"\"<\/figure><\/div>\n\n\n\n
        \u5408\u5e76\u4e4b\u524d\uff0c\u8bf7\u59cb\u7ec8\u786e\u4fdd\u60a8\u7684\u5206\u652f\u4e0e\u8fdc\u7a0b\u5206\u652f\u662f\u6700\u65b0\u7684\u3002<\/p>\n\n\n\n
        git merge\u6700\u5927\u7684\u4f18\u70b9\u662f\u63d0\u4ea4\u7684\u5386\u53f2\u8bb0\u5f55\u4fdd\u6301\u6e05\u6670\u548c\u4e0d\u53d8\u3002<\/p>\n\n\n\n
        \u7f3a\u70b9\u662f\u5927\u91cf\u7684\u5408\u5e76\u63d0\u4ea4\u4f1a\u4f7f\u5206\u652f\u5386\u53f2\u8bb0\u5f55\u4e0d\u53ef\u8bfb\u3002<\/p>\n\n\n\n
        Rebase<\/strong><\/p>\n\n\n\n
        \u7b2c\u4e8c\u4e2a\u9009\u9879\u662fgit rebase\u3002Git rebase\u6b63\u5728\u66f4\u6539\u5206\u652f\u4e0a\u7b2c\u4e00\u6b21\u63d0\u4ea4\u7684\u7236\u7ea7\u3002\u56e0\u6b64\uff0cgit rebase master\u4f1a\u5c06\u5206\u652f\u7684\u7b2c\u4e00\u6b21\u63d0\u4ea4\u7684\u7236\u7ea7\u66f4\u6539\u4e3amaster\u5206\u652f\u4e0a\u7684\u6700\u65b0\u63d0\u4ea4\u3002<\/p>\n\n\n\n
        \u4e3a\u6b64\uff0c\u9700\u8981\u4fee\u6539\u5206\u652f\u4e0a\u7684\u6240\u6709\u63d0\u4ea4\uff0c\u56e0\u4e3a\u8fd9\u6837\uff0c\u5b83\u4eec\u5c06\u5305\u542b\u5728\u4e3b\u670d\u52a1\u5668\u4e0a\u6240\u505a\u7684\u66f4\u6539\u3002\u7531\u4e8e\u60a8\u6b63\u5728\u66f4\u6539\u63d0\u4ea4\uff0c\u56e0\u6b64\u5176\u54c8\u5e0cID\u4e5f\u5c06\u66f4\u6539\u3002\u56e0\u6b64\uff0c\u4ece\u6280\u672f\u4e0a\u8bb2\uff0c\u5b83\u4eec\u5c06\u662f\u65b0\u7684\u63d0\u4ea4\u3002\u8fd9\u4e5f\u610f\u5473\u7740\u540c\u4e00\u63d0\u4ea4\u7684\u591a\u4e2a\u5b9e\u4f8b\uff08\u57fa\u4e8e\u548c\u4e0d\u57fa\u4e8e\uff09\u53ef\u4ee5\u5728git\u65e5\u5fd7\u4e2d\u51fa\u73b0\u3002\u60a8\u771f\u7684\u8981\u6ce8\u610f\uff01<\/p>\n\n\n\n
        \u6b64\u5916\uff0cgit rebase\u662f\u901a\u8fc7commit\u63d0\u4ea4\u6765\u5b8c\u6210\u7684\uff0c\u56e0\u6b64\u76f8\u540c\u7684\u51b2\u7a81\u4f1a\u4e00\u6b21\u53c8\u4e00\u6b21\u5730\u51fa\u73b0\u3002<\/p>\n\n\n\n
        \"\"<\/figure><\/div>\n\n\n\n
        \u6b64\u65b9\u6cd5\u7684\u4f18\u70b9\u662f\u60a8\u7684\u5386\u53f2\u8bb0\u5f55\u5c06\u4fdd\u6301\u4e00\u6761\u76f4\u7ebf\uff0c\u53e6\u4e00\u65b9\u9762\uff0c\u4ee5\u540e\u5c06\u65e0\u6cd5\u786e\u5b9agit rebase\u53d1\u751f\u4e86\u3002<\/p>\n\n\n\n
        \u5982\u679c\u591a\u4e2a\u5f00\u53d1\u4eba\u5458\u5728\u540c\u4e00\u4e2a\u5206\u652f\u4e0a\u5de5\u4f5c\uff0c\u5219\u5e94\u7279\u522b\u6ce8\u610f\u91cd\u65b0\u7f16\u5236\u57fa\u51c6(rebasing)\u3002<\/p>\n\n\n\n
        \u603b\u7ed3<\/strong><\/p>\n\n\n\n
        \n\n\n\n
        • \u603b\u7ed3\u4e00\u4e0b\u4e3b\u9898\uff1agit merge\u4e0d\u4f1a\u66f4\u6539\u4efb\u4f55\u73b0\u6709\u7684\u63d0\u4ea4\uff0c\u5b83\u53ea\u662f\u521b\u5efa\u4e00\u4e2a\u65b0\u7684\u5408\u5e76\u63d0\u4ea4\uff0c\u8be5\u63d0\u4ea4\u5177\u6709\u4e24\u4e2a\u6216\u591a\u4e2a\u7236\u7ea7\u3002<\/li>
        • Git rebase\u66f4\u6539\u4e86\u4e00\u4e2a\u63d0\u4ea4\u7684\u7236\u7ea7\uff08\u901a\u5e38\u662f\u5206\u652f\u7684\u6839\uff0c\u6216\u4f5c\u4e3a\u53c2\u6570\u7ed9\u51fa\u7684\u63d0\u4ea4\uff09\u3002\u6362\u53e5\u8bdd\u8bf4\uff0c\u5b83\u6b63\u5728\u91cd\u5199\u5206\u652f\uff08\u6216\u63d0\u4ea4\uff09\u7684\u5386\u53f2\u8bb0\u5f55\u3002\u63d0\u4ea4\u5c06\u83b7\u5f97\u65b0\u7684\u54c8\u5e0cID\u3002<\/li>
        • Git cherry-pick\u4f7f\u7528\u65b0\u7684\u63d0\u4ea4ID\u5728\u5f53\u524d\u5206\u652f\u4e0a\u91cd\u65b0\u5e94\u7528\u4e00\u4e2a\u4e13\u7528\u4e3b\u200b\u200b\u9898\u3002cherry-picked\u7684\u63d0\u4ea4\u4fdd\u6301\u4e0d\u53d8\u3002<\/li><\/ul>\n","protected":false},"excerpt":{"rendered":"
          1. \u7b80\u4ecb Git\u662f\u4e00\u6b3e\u5206\u5e03\u5f0f\u7248\u672c\u63a7\u5236\u7cfb\u7edf\uff0c\u5b83\u63d0\u4f9b\u4e86\u8bb8\u591a\u5f3a\u5927\u7684\u529f\u80fd\u6765\u7ba1\u7406\u4ee3\u7801\u7684\u7248\u672c\u548c\u53d8\u66f4\u3002\u5176\u4e2d\u4e4b\u4e00\u5c31\u662fcher […]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[30],"tags":[],"_links":{"self":[{"href":"https:\/\/92it.top\/index.php?rest_route=\/wp\/v2\/posts\/12637"}],"collection":[{"href":"https:\/\/92it.top\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/92it.top\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/92it.top\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/92it.top\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=12637"}],"version-history":[{"count":1,"href":"https:\/\/92it.top\/index.php?rest_route=\/wp\/v2\/posts\/12637\/revisions"}],"predecessor-version":[{"id":12646,"href":"https:\/\/92it.top\/index.php?rest_route=\/wp\/v2\/posts\/12637\/revisions\/12646"}],"wp:attachment":[{"href":"https:\/\/92it.top\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=12637"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/92it.top\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=12637"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/92it.top\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=12637"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}