{"id":37484,"date":"2023-10-19T16:10:54","date_gmt":"2023-07-11T04:39:46","guid":{"rendered":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%8d%b3%e4%bd%bf%e6%97%a0%e6%b3%95%e4%bd%bf%e7%94%a8git-rebase%ef%bc%8c%e4%b9%9f%e5%8f%af%e4%bb%a5%e3%80%82%e5%8f%a6%e5%a4%96%ef%bc%8cgit-cherry-pick%e5%92%8cgit-merge-squash-%e4%b9%9f%e6%98%af\/"},"modified":"2024-05-04T05:01:40","modified_gmt":"2024-05-03T21:01:40","slug":"%e5%8d%b3%e4%bd%bf%e6%97%a0%e6%b3%95%e4%bd%bf%e7%94%a8git-rebase%ef%bc%8c%e4%b9%9f%e5%8f%af%e4%bb%a5%e3%80%82%e5%8f%a6%e5%a4%96%ef%bc%8cgit-cherry-pick%e5%92%8cgit-merge-squash-%e4%b9%9f%e6%98%af","status":"publish","type":"post","link":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%8d%b3%e4%bd%bf%e6%97%a0%e6%b3%95%e4%bd%bf%e7%94%a8git-rebase%ef%bc%8c%e4%b9%9f%e5%8f%af%e4%bb%a5%e3%80%82%e5%8f%a6%e5%a4%96%ef%bc%8cgit-cherry-pick%e5%92%8cgit-merge-squash-%e4%b9%9f%e6%98%af\/","title":{"rendered":"\u5373\u4f7f\u65e0\u6cd5\u4f7f\u7528Git rebase\uff0c\u4e5f\u53ef\u4ee5\u3002\u53e6\u5916\uff0cGit cherry-pick\u548cGit merge –squash \u4e5f\u662f\u53ef\u4ee5\u7684"},"content":{"rendered":"

\u58f0\u660e\uff1a\u8fd9\u4ec5\u4ec5\u662f\u4e2a\u4eba\u610f\u89c1\u3002<\/h1>\n

\u5728\u5fae\u8f6f\u603b\u90e8\u5de5\u4f5c\u4e866\u5e74\uff0c\u53c2\u4e0e\u4e86\u51e0\u4e2a\u4ea7\u54c1\u56e2\u961f\u7684\u5f00\u53d1\uff0c\u6211\u6709\u4e00\u4e9b\u611f\u609f\u3002<\/p>\n

\u7528Git\u547d\u4ee4\u4e0d\u9700\u8981\u7684\u4e1c\u897f\u3002<\/h1>\n

Git rebase \u6ca1\u6709\u5fc5\u8981\u3002<\/h2>\n

\u867d\u7136\u6709\u4eba\u8ba4\u4e3a\u4f7f\u7528git rebase\u6709\u5f88\u591a\u4f18\u70b9\uff0c\u6bd4\u5982\u7701\u53bb\u4e86\u5408\u5e76\u63d0\u4ea4\u3001\u4f7f\u63d0\u4ea4\u56fe\u66f4\u6613\u8bfb\u7b49\uff0c\u4f46\u6211\u8ba4\u4e3a\u8fd9\u4e9b\u4e0e\u63d0\u4ea4\u56fe\u8d28\u91cf\u5bf9\u4e8e\u201c\u4ea7\u54c1\/\u670d\u52a1\u7684\u4ef7\u503c\u201d\u5e76\u6ca1\u6709\u592a\u5927\u5173\u7cfb\uff0c\u6240\u4ee5\u8fd9\u5c31\u662f\u6211\u4e0d\u4f7f\u7528git rebase\u7684\u7406\u7531\u3002\u5982\u679c\u5728\u79c1\u4eba\u5206\u652f\u4e0a\u4f7f\u7528\uff0c\u6211\u5e76\u4e0d\u4ecb\u610f\uff0c\u4f46\u5982\u679c\u5c06\u5176\u4f5c\u4e3a\u201c\u6574\u4e2a\u56e2\u961f\u7684\u89c4\u5b9a\u201d\uff0c\u6211\u8ba4\u4e3a\u8fd9\u4f1a\u9002\u5f97\u5176\u53cd\uff0c\u5bfc\u81f4\u5de5\u4f5c\u6548\u7387\u4e0b\u964d\u3002\u6211\u89c9\u5f97\u5982\u679c\u6709\u65f6\u95f4\u8fdb\u884cgit rebase\u7684\u64cd\u4f5c\uff0c\u6700\u597d\u662f\u8f6c\u79fb\u5230\u4e0b\u4e00\u4e2a\u4efb\u52a1\u4e0a\u3002\u5b9e\u9645\u4e0a\uff0c\u6211\u51e0\u4e4e\u4ece\u672a\u89c1\u8fc7\u6709\u4eba\u4f7f\u7528\uff08\u6216\u8005\u8bf4\u5c31\u7b97\u6709\u4f7f\u7528\u4e5f\u770b\u4e0d\u51fa\u6765\uff09\u3002\u81f3\u5c11\u6211\u81ea\u5df1\u4e0d\u4f7f\u7528\u3002<\/p>\n

\u7528 Git cherry-pick \u52a8\u4f5c\u662f\u4e0d\u5fc5\u8981\u7684\u3002<\/h2>\n

\u4e2a\u4eba\u8ba4\u4e3a\uff0c\u8fd9\u79cd\u505a\u6cd5\u662f\u201c\u767e\u5bb3\u65e0\u4e00\u5229\u201d\u3002\u867d\u7136\u8868\u9762\u4e0a\u770b\u8d77\u6765\u5f88\u65b9\u4fbf\uff0c\u5b9e\u9645\u4e0a\u4e5f\u53ef\u80fd\u771f\u7684\u5f88\u65b9\u4fbf\uff0c\u4f46\u6211\u89c9\u5f97\u8fd9\u66f4\u50cf\u662f\u4e00\u79cd\u201c\u4e00\u6b21\u6027\u7684\u9ed1\u5ba2\u201d\u3002\u4f8b\u5982\uff0c\u5728\u4fee\u590d\u7d27\u6025\u9519\u8bef\u65f6\uff0c\u6709\u4e00\u4e2a\u6d41\u7a0b\u662f\u4ece\u5f00\u53d1\u5206\u652f\u6d3e\u751f\u51fa\u70ed\u4fee\u590d\u5206\u652f\u6765\u4fee\u590d\uff0c\u5e76\u5c06\u5176\u62fe\u53d6\u5230\u53d1\u5e03\u5206\u652f\u4e2d\uff0c\u4f46\u6700\u4f73\u5b9e\u8df5\u662f\u76f8\u53cd\u7684\uff0c\u5e94\u8be5\u4ece\u53d1\u5e03\u5206\u652f\u6d3e\u751f\u51fa\u70ed\u4fee\u590d\u5206\u652f\u6765\u4fee\u590d\u8be5\u9519\u8bef\uff0c\u7136\u540e\u5c06\u5176\u5408\u5e76\u5230\u53d1\u5e03\u5206\u652f\uff0c\u518d\u5408\u5e76\u5230\u5f00\u53d1\u5206\u652f\uff0c\u8fd9\u6837\u5c31\u4e0d\u9700\u8981\u62fe\u53d6\u4e86\u3002<\/p>\n

\u5982\u679c\u60f3\u8981\u5bf9\u67d0\u4e2a\u529f\u80fd\u8fdb\u884c\u6709\u9650\u53d1\u5e03\uff0c\u9996\u5148\u5728\u8bbe\u8ba1\u4e2d\u6dfb\u52a0\u98de\u884c\u6a21\u5f0f\u529f\u80fd\uff0c\u4ee5\u4f7f\u5176\u5904\u4e8e\u201c\u672a\u66dd\u5149\u201d\u7684\u72b6\u6001\u8fdb\u884c\u53d1\u5e03\u3002\u7136\u540e\uff0c\u901a\u8fc7\u98de\u884c\u6a21\u5f0f\u8bbe\u7f6e\uff0c\u53ef\u4ee5\u5b9e\u73b0\u7279\u5b9a\u529f\u80fd\u7684\u201c\u66dd\u5149\u201d\uff0c\u4ece\u800c\u8fbe\u5230\u76ee\u7684\u3002\u6839\u636e\u6211\u7684\u89c2\u70b9\uff0c\u8ba9\u4e00\u4e2a\u529f\u80fd\u7684\u63d0\u4ea4\u662f\u5426\u5305\u542b\u5728\u7279\u5b9a\u5206\u652f\u4e2d\u6765\u63a7\u5236\u7528\u6237\u7684\u8bbf\u95ee\u6743\u9650\uff0c\u5bf9\u4e8e\u5206\u652f\u6765\u8bf4\u662f\u8d1f\u62c5\u8fc7\u91cd\u3002\u4e3a\u4e86\u66f4\u63a5\u8fd1\u6700\u4f73\u5b9e\u8df5\uff0c\u4e2a\u4eba\u8ba4\u4e3a\u5e94\u8be5\u5728\u56e2\u961f\u5c42\u9762\u4e0a\u4e0d\u9f13\u52b1\u4f7f\u7528\u4f7f\u7528\u6a31\u6843\u62e3\u9009\u6280\u5de7\u3002<\/p>\n

\u4e0d\u9700\u8981\u4f7f\u7528 Git merge –squash\u3002<\/h2>\n

\u6709\u4e9b\u52a8\u673a\u53ef\u80fd\u662f\u4e0d\u60f3\u5728\u6bcf\u6b21\u63d0\u4ea4\u65f6\u7559\u4e0b\u8be6\u7ec6\u7684\u6d88\u606f\u3002\u4f46\u662f\u5373\u4f7f\u63d0\u4ea4\u56fe\u4e2d\u6709\u8bb8\u591a\u65e0\u7528\u7684\u63d0\u4ea4\u548c\u63d0\u4ea4\u6d88\u606f\uff0c\u6211\u8ba4\u4e3a\u5728\u6570\u5468\u3001\u6570\u6708\u6216\u6570\u5e74\u540e\uff0c\u95ee\u9898\u4e5f\u4e0d\u4f1a\u6210\u4e3a\u591a\u5927\u95ee\u9898\u3002\u4ee5\u524d\u5927\u5bb6\u90fd\u4f1a\u52aa\u529b\u538b\u7f29\u63d0\u4ea4\uff0c\u4f46\u73b0\u5728\u5f88\u5c11\u8fd9\u6837\u505a\u7684\u4eba\uff0c\u662f\u4e0d\u662f\u6709\u5f88\u591a\u5462\uff1f\u6211\u8ba4\u4e3a\u4e0e\u5176\u9f13\u52b1\u968f\u4fbf\u63d0\u4ea4\u4ee5\u4fbf\u538b\u7f29\uff0c\u4e0d\u5982\u517b\u6210”\u5728\u9002\u5f53\u7684\u5730\u65b9\u63d0\u4ea4”\u7684\u4e60\u60ef\uff0c\u56e0\u4e3a\u80fd\u770b\u5230\u63d0\u4ea4\u7684\u5386\u53f2\u624d\u66f4\u91cd\u8981\u3002\u6211\u8ba4\u4e3a\u5468\u56f4\u5e76\u6ca1\u6709\u592a\u5728\u610f\u662f\u5426\u538b\u7f29\u63d0\u4ea4\u7684\u4eba\u3002<\/p>\n

\u53ea\u8981\u4e86\u89e3\u4e86\u8fd9\u4e2a\uff0cGit \u547d\u4ee4\u5c31\u8db3\u591f\u4e86\u3002<\/h1>\n

\u514b\u9686Git<\/h2>\n

\u521b\u5efa\u4ed3\u5e93\u7684\u526f\u672c\uff08\u514b\u9686\uff09\u662f\u7edd\u5bf9\u5fc5\u8981\u7684\u3002\u4ee5\u6211\u4e3a\u4f8b\uff0c\u5373\u4f7f\u662f\u76f8\u540c\u7684\u8fdc\u7a0b\u4ed3\u5e93\uff0c\u6211\u4e5f\u4f1a\u521b\u5efa\u591a\u4e2a\u526f\u672c\u3002\u6709\u65f6\u6211\u540c\u65f6\u5728\u51e0\u4e2a\u5206\u652f\u4e0a\u8fdb\u884c\u5de5\u4f5c\u3002\u8fd9\u65f6\uff0c\u6211\u4f1a\u5728\u672b\u5c3e\u52a0\u4e0a\u6570\u5b572\u30013\u30014\u6765\u514b\u9686\u3002<\/p>\n

git clone https:\/\/github.com\/yoshiwatanabe\/test.git test2\r\n<\/code><\/pre>\n
Git\u6dfb\u52a0<\/h2>\n
\u7279\u522b\u662f\uff0c\u4f7f\u7528\u901a\u914d\u7b26\u5c06\u6240\u6709\u6587\u4ef6\u79fb\u52a8\u5230\u6682\u5b58\u533a\uff08\u7d22\u5f15\uff09\u7684\u65b9\u6cd5\u3002<\/p>\n
git add . \r\n<\/code><\/pre>\n
\u6211\u5728\u65e5\u5e38\u751f\u6d3b\u4e2d\u7ecf\u5e38\u4f7f\u7528\u5b83\u3002<\/p>\n
\u9519\u8bef\u5730\u653e\u5165\u4e86\u6682\u5b58\u533a\u7684\u6587\u4ef6.<\/p>\n
git reset HEAD \uff1c\u30d5\u30a1\u30a4\u30eb\u306e\u30d1\u30b9\uff1e\u3000\r\n<\/code><\/pre>\n
\u5c06\u5176\u4ece\u821e\u53f0\u4e0a\u62d6\u4e0b\u6765\u3002<\/p>\n
\u63d0\u4ea4Git<\/h1>\n
git commit -m \"\u30b3\u30df\u30c3\u30c8\u306e\u76ee\u7684\"\r\n<\/code><\/pre>\n
\u6211\u5dee\u4e0d\u591a\u80fd\u89e3\u51b3\u8fd9\u4e2a\u95ee\u9898\u3002<\/p>\n
\u5076\u5c14\uff0c\u6211\u4f1a\u4f7f\u7528 “–amend” \u63d0\u4ea4\u6765\u8865\u9001\u9057\u6f0f\u7684\u7269\u54c1\uff0c\u4f46\u4ec5\u9650\u4e8e\u5c1a\u672a\u5c06\u63d0\u4ea4\u5185\u5bb9\u63a8\u9001\u5230GitHub\u7b49\u5e73\u53f0\u7684\u65f6\u5019\u3002<\/p>\n
git commit --amend\r\n<\/code><\/pre>\n
\u4f46\u8fd9\u5e76\u4e0d\u662f\u7edd\u5bf9\u5fc5\u8981\u7684\u3002\u4f60\u53ea\u9700\u8981\u5728\u65b0\u7684\u63d0\u4ea4\u4e2d\u4ea4\u4ed8\u9057\u5931\u7269\u54c1\u5373\u53ef\u3002<\/p>\n
\u5982\u679c\u6709\u8fd9\u6837\u7684\u60c5\u666f\uff0c\u5373\u88ab\u540c\u4e8b\u6216\u4e0a\u53f8\u544a\u77e5\u5c06\u63d0\u4ea4\uff08commit\uff09\u505a\u6210\u5b8c\u6574\u7684\uff0c\u4e0d\u8981\u540e\u6765\u518d\u4fee\u6539\u9057\u6f0f\u7684\u5730\u65b9\uff0c\u5982\u679c\u8fd8\u6ca1\u6709\u63a8\u9001\uff08push\uff09\uff0c\u5c31\u4f7f\u7528 commit –amend \u6765\u8fdb\u884c\u4fee\u6539\u3002\u90a3\u4e48\u8fd9\u4e2a\u4eba\u53ef\u80fd\u53ea\u662f\u201c\u8fc7\u5206\u8ffd\u6c42\u5b8c\u7f8e\u201d\uff0c\u5f53\u7136\u8fd9\u4e5f\u53d6\u51b3\u4e8e\u56fd\u5bb6\u4e60\u4fd7\u548c\u56e2\u961f\u6587\u5316\u3002\u5728\u6211\u6240\u5728\u7684\u5fae\u8f6f\u56e2\u961f\u4e2d\uff0c\u6211\u4ece\u6765\u6ca1\u6709\u89c1\u8fc7\u90a3\u4e48\u5728\u610f\u63d0\u4ea4\u7684\u5b8c\u6574\u6027\u7684\u4eba\u3002\u6240\u4ee5\u6bd4\u8d77\u8fd9\u79cd\u4e8b\u60c5\uff0c\u66f4\u597d\u7684\u65b9\u5f0f\u662f\u5c3d\u5feb\u8f6c\u79fb\u5230\u4e0b\u4e00\u4e2a\u4efb\u52a1\u4e0a\u3002<\/p><\/blockquote>\n
\u62c9\u53d6 Git<\/h1>\n
\u5728Git\u4e2d\uff0c\u6700\u5b89\u5168\u4e14\u61c9\u76e1\u53ef\u80fd\u983b\u7e41\u57f7\u884c\u7684\u547d\u4ee4\u662f\u4ec0\u9ebc\uff1f<\/p>\n
git fetch\r\n<\/code><\/pre>\n
\u5b83\u80fd\u591f\u5c06\u624b\u4e0a\u7684GitHub\u7b49\u4e2d\u5fc3\u4ed3\u5e93\u7684\u72b6\u6001\u66f4\u65b0\u4e3a\u6700\u65b0\u7684\u3002<\/p>\n
\u5b9e\u9645\u4e0a\uff0c\u8fd9\u4e2a\u547d\u4ee4\u53ea\u662f\u4e0b\u8f7d\u4e2d\u592e\u4ed3\u5e93\u7684\u6700\u65b0\u72b6\u6001\uff0c\u6240\u4ee5\u4ec5\u8fd9\u6837\u505a\u5e76\u6ca1\u6709\u592a\u591a\u610f\u4e49\u3002\u5728\u6211\u7684\u5de5\u4f5c\u6d41\u7a0b\u4e2d\uff0c\u8fd9\u4e2a\u547d\u4ee4\u540e\u9762\u4f1a\u8ddf\u7740git pull\u3001git merge\u3001git remote prune origin\u7b49\uff08\u7a0d\u540e\u4f1a\u63d0\u5230\uff09\u3002<\/p>\n
    \n
  • \n
      \u30cd\u30c3\u30c8\u74b0\u5883\u304c\u306a\u3044\u30ad\u30e3\u30f3\u30d7\u5834\u3067\u4ed5\u4e8b\u3059\u308b\u4e88\u5b9a\u304c\u3042\u308b\u5834\u5408\u3001\u540c\u50da\u306e\u30c8\u30d4\u30c3\u30af\u30d6\u30e9\u30f3\u30c1\u3082\u542b\u3081\u3066\u5b8c\u5168\u306b\u6700\u65b0\u306e\u72b6\u614b\u3067\u51fa\u767a\u3057\u305f\u3044<\/ul>\n<\/li>\n<\/ul>\n
       <\/p>\n
        \n
      • \n
          \u540c\u50da\u306e\u30c8\u30d4\u30c3\u30af\u30d6\u30e9\u30f3\u30c1\u3082\u898b\u3048\u308b\u72b6\u614b\u306b\u306a\u308b\u306e\u3067\u3001\u3060\u308c\u304c\u3069\u306e\u3042\u305f\u308a\u306e\u30b3\u30fc\u30c9\u3092\u3044\u3058\u3063\u3066\u308b\u304b\u5206\u304b\u308b<\/ul>\n<\/li>\n<\/ul>\n
          git pull \u306f\u5b9f\u306f git fetch \u3068 git merge \u306e\u30b7\u30e7\u30fc\u30c8\u30ab\u30c3\u30c8\u3060\u3068\u3044\u3046\u7406\u89e3\u3092\u6df1\u3081\u308b<\/p>\n
          \u6709\u8bb8\u591a\u4f18\u70b9\u3002<\/p>\n
          \u65e0\u8bba\u54ea\u79cd\u9009\u62e9\uff0c\u624b\u5934\u7684\u4ed3\u5e93\u4fdd\u6301\u4e3a\u4e2d\u592e\u4ed3\u5e93\u7684\u6700\u65b0\u7248\u672c\u5e76\u6ca1\u6709\u4ec0\u4e48\u4e0d\u597d\u7684\u3002<\/p>\n
          \u62c9\u53d6Git<\/h1>\n
          \u5176\u5b9e\uff0cgit fetch\u4e5f\u4f1a\u5728\u540e\u53f0\u81ea\u52a8\u6267\u884c\u3002\u867d\u7136\u6211\u4e60\u60ef\u5148\u6267\u884cgit fetch\uff0c\u7136\u540e\u518d\u6267\u884cgit pull\uff0c\u4f46\u5176\u5b9egit fetch\u662f\u4e0d\u5fc5\u8981\u7684\uff08\u4ee5\u524d\u4e0d\u4f7f\u7528”git pull”\u547d\u4ee4\uff0c\u800c\u662f\u7528”git fetch”\u540e\u7d27\u8ddf”git merge”\u7684\u7ec4\u5408\u65b9\u5f0f\uff09\u3002<\/p>\n
          git pull\r\n<\/code><\/pre>\n
          \u6211\u53ef\u4ee5\u5c06\u5f53\u524dcheckout\u4e2d\u7684\u672c\u5730\u5206\u652f\u66f4\u65b0\u4e3a\u6700\u65b0\u72b6\u6001\uff08\u5373\u4e2d\u592e\u5b58\u50a8\u5e93\u4e2d\u5bf9\u5e94\u5206\u652f\u7684\u6700\u65b0\u72b6\u6001\uff09\uff0c\u539f\u56e0\u6709\u4e24\u79cd\u60c5\u51b5\u3002<\/p>\n
          \u6211\u80fd\u591f\u5c06\u5f53\u524d\u7684checkout\u4e2d\u7684\u672c\u5730\u5206\u652f\u66f4\u65b0\u4e3a\u6700\u65b0\u7684\u72b6\u6001\uff0c\u8fd9\u6837\u505a\u6709\u4e24\u79cd\u60c5\u51b5\u3002<\/p>\n
          \u60c5\u58831<\/h3>\n
          \u5728\u5904\u7406\u4e3b\u9898\u5206\u652f\u65f6\uff0c\u5982\u679c\u5de5\u4f5c\u4ecd\u9700\u4e00\u6bb5\u65f6\u95f4\u624d\u80fd\u5b8c\u6210\uff0c\u53ef\u4ee5\u5148\u5c06\u9884\u8ba1\u5408\u5e76\u7684\u76ee\u6807\u5206\u652f\uff08\u4f8b\u5982\uff1amaster\uff09\u66f4\u65b0\u81f3\u6700\u65b0\u7248\u672c\uff0c\u7136\u540e\u4f7f\u7528git merge\u5c06\u5176\u5408\u5e76\u5230\u4e3b\u9898\u5206\u652f\u4e2d\u3002<\/p>\n
          \u8fd9\u4e2a\u4efb\u52a1\u975e\u5e38\u91cd\u8981\u3002\u56e0\u4e3a\u5982\u679c\u6211\u7684\u4e3b\u9898\u5206\u652f\uff08\u5305\u62ec\u5c06\u8981\u5408\u5e76\u7684\u76ee\u6807\u5206\u652f\u7684\u5185\u5bb9\uff09\u843d\u540e\uff0c\u90a3\u4e48\u540c\u4e8b\u4eec\u5c31\u4f1a\u8d8a\u6765\u8d8a\u9891\u7e41\u5730\u72af\u9519\uff0c\u4f8b\u5982\u91cd\u65b0\u4fee\u590d\u5df2\u7ecf\u4fee\u590d\u8fc7\u7684\u9519\u8bef\uff0c\u9519\u8fc7\u4e86\u540c\u4e8b\u4eec\u5df2\u7ecf\u4f18\u5316\u7684\u65b9\u4fbf\u673a\u5236\uff0c\u6216\u8005\u65e0\u610f\u4e2d\u4fee\u590d\u4e86\u540c\u4e8b\u4eec\u5df2\u7ecf\u5220\u9664\u7684\u65e7\u4ee3\u7801\u4e2d\u7684\u9519\u8bef\u7b49\u3002<\/p>\n
          \u5982\u679c\u7ecf\u5e38\u53d1\u751f\uff0c\u51b2\u7a81\u53d1\u751f\u65f6\u7684\u89c4\u6a21\u5c31\u4f1a\u8f83\u5c0f\uff0c\u8fd9\u6837\u907f\u514d\u9ebb\u70e6\u3002<\/p>\n
          \u5728\u4e2d\u56fd\uff0c\u53ea\u9700\u8981\u4f7f\u7528\u4e00\u79cd\u9009\u9879\u6765\u7ffb\u8bd1\u4ee5\u4e0b\u53e5\u5b50\uff1a\u300c\u30b7\u30c1\u30e5\u30a8\u30fc\u30b7\u30e7\u30f3\uff12\u300d\u3002<\/h3>\n
          \u5728\u5f00\u59cb\u7f16\u7801\u4e4b\u524d\uff0c\u4e5f\u5c31\u662f\u5728\u521b\u5efa\u65b0\u7684\u4e3b\u9898\u5206\u652f\u4e4b\u524d\uff0c\u5c3d\u53ef\u80fd\u5730\u4ee5\u6700\u65b0\u7684\u72b6\u6001\uff08\u5373\u4e2d\u592e\u4ed3\u5e93\u4e2d\u8be5\u5206\u652f\u7684\u6700\u65b0\u63d0\u4ea4\uff09\u4f5c\u4e3a\u8d77\u70b9\uff0c\u4e3a\u4e86\u65b0\u4efb\u52a1\u7684\u5b8c\u6210\u3002<\/p>\n
          Git\u5408\u5e76<\/h1>\n
          \u5728\u60c5\u666f1\u4e2d\uff0c\u5927\u90e8\u5206\u60c5\u51b5\u4e0b\u4f1a\u4f7f\u7528git merge\uff0c\u8fd9\u4e2a\u573a\u666f\u662f\u5728\u6267\u884cgit pull\u64cd\u4f5c\u540e\u3002<\/p>\n
          \u5076\u5c14\uff0c\u6211\u4f1a\u6839\u636e\u540c\u4e8b\u63a8\u8350\u7684\u5373\u5c06\u5b8c\u6210\u7684\u4e3b\u9898\u5206\u652f\u5c06\u5176\u5408\u5e76\u5230\u6211\u7684\u5de5\u4f5c\u5206\u652f\u4e2d\uff0c\u8fd9\u65f6\u5019\u5fc5\u987b\u5047\u8bbe\u540c\u4e8b\u5df2\u7ecf\u901a\u8fc7git push\u5c06\u76f8\u5173\u5206\u652f\u63a8\u9001\u5230\u4e2d\u592e\u4ed3\u5e93\u3002<\/p>\n
          \u5207\u6362\u5230 Git \u5206\u652f<\/h1>\n
          \u6709\u4e24\u4e2a\u60c5\u666f<\/p>\n
          \u60c5\u58831<\/h3>\n
          \u5728\u4e2d\u6587\u7684\u53e3\u8bed\u4e2d\u662f\u8fd9\u6837\u7684\uff1a\u201c\u5728\u4e0d\u540c\u7684\u5206\u652f\u4e4b\u95f4\u6765\u56de\u5207\u6362\uff0c\u4e5f\u5c31\u662f\u4e3a\u4e86\u5c06\u5de5\u4f5c\u76ee\u5f55\u5207\u6362\u5230\u4e0d\u540c\u5206\u652f\u7684\u72b6\u6001\u3002\u7279\u522b\u662f\u5728\u5c06\u6b63\u5728\u8fdb\u884c\u4e2d\u7684\u8bdd\u9898\u5206\u652f\u4e0e\u76ee\u6807\u5206\u652f\uff08\u4f8b\u5982\uff1a\u4e3b\u5206\u652f\uff09\u5408\u5e76\u65f6\uff0c\u8fdb\u884c\u4e00\u7cfb\u5217\u64cd\u4f5c\u4f7f\u5176\u4fdd\u6301\u6700\u65b0\u3002\u201d<\/p>\n
          git checkout master\r\ngit pull\r\ngit checkout topics\/task2\r\ngit merge master\r\n<\/code><\/pre>\n
          \u5c31\u50cfcheckout\u4e00\u6837\u8fdb\u884c\u79fb\u52a8\u3002<\/p>\n
          \u4ee5\u4e0b\u662f\u7528\u4e2d\u6587\u5bf9\u201c\u30b7\u30c1\u30e5\u30a8\u30fc\u30b7\u30e7\u30f3\uff12\u201d\u7684\u63cf\u8ff0\uff1a
          \n\u573a\u666f\uff12<\/h3>\n
          \u5728\u521b\u5efa\u65b0\u4e3b\u9898\u5206\u652f\u65f6\uff0c\u53ef\u4ee5\u4f7f\u7528”-b” \u53c2\u6570\u6765\u8868\u793a”\u521b\u5efa\u65b0\u5206\u652f\u5e76\u5207\u6362\u5230\u8be5\u5206\u652f”\u7684\u610f\u601d\u3002<\/p>\n
          git checkout -b topics\/task3\r\n<\/code><\/pre>\n
          \u6211\u4f1a\u505a\u5230\u3002<\/p>\n
          \u63a8\u9001Git<\/h1>\n
          git push\r\n<\/code><\/pre>\n
          \u6211\u901a\u5e38\u4f1a\u4f7f\u7528\u5b83\u5c06\u6211\u7684\u5206\u652f\u4e0a\u4f20\u5230\u4e2d\u592e\u4ed3\u5e93\u3002\u6211\u7684\u5de5\u4f5c\u7ecf\u5e38\u4ee5git push\u7ed3\u675f\u3002\u901a\u8fc7\u5c06\u5b83\u63a8\u9001\u5230\u4e2d\u592e\u4ed3\u5e93\uff0c\u53ef\u4ee5\u786e\u8ba4\u5b83\u5df2\u7ecf\u88ab\u4e91\u5b58\u50a8\u5907\u4efd\uff0c\u5373\u4f7f\u6211\u7684\u7b14\u8bb0\u672c\u4e0d\u5c0f\u5fc3\u5728\u67d0\u5904\u88ab\u6c34\u6df9\u6ca1\uff0c\u6211\u5f53\u5929\u7684\u5de5\u4f5c\u5185\u5bb9\u4e5f\u4e0d\u4f1a\u4e22\u5931\u3002<\/p>\n
          \u6700\u7ec8\u76ee\u6807\u5206\u652f\uff08\u4f8b\u5982\uff1a\u4e3b\u5206\u652f\uff09\u4e0d\u4f7f\u7528push\uff0c\u800c\u662f\u4f7f\u7528\u62c9\u53d6\u8bf7\u6c42\uff08pull request\uff09\u3002\u62c9\u53d6\u8bf7\u6c42\u4e0d\u662fGit\u7684\u6838\u5fc3\u529f\u80fd\uff0c\u4f46\u662f\u662f\u4e00\u79cd\u5e38\u89c1\u7684\u65b9\u6cd5\u3002<\/p><\/blockquote>\n
          \u5220\u9664 Git \u8fdc\u7a0b\u4ed3\u5e93\u7684\u65e0\u6548\u5206\u652f\u3002<\/h1>\n
          \u8fd9\u4e5f\u662f\u4e00\u79cd\u5b89\u5168\u7684Git\u547d\u4ee4\u3002\u7528\u4e8e\u6e05\u7406\u5206\u652f\u3002<\/p>\n
          git remote prune origin\r\n<\/code><\/pre>\n
          \u6211\u4f1a\u4ece git fetch \u5f00\u59cb\u505a\u3002\u8fd9\u662f\u4e00\u4e2a\u5b89\u5168\u547d\u4ee4\uff0c\u53ea\u8981\u5c1d\u8bd5\u4f7f\u7528\uff0c\u5c31\u53ef\u4ee5\u8f7b\u677e\u7406\u89e3\u3002<\/p>\n
          \u624b\u4e2d\u7684\u4e2d\u592e\u4ed3\u5e93\u53ef\u80fd\u5305\u542b\u4e00\u4e9b\u5728\u50cfGitHub\u8fd9\u6837\u7684\u4e2d\u592e\u4ed3\u5e93\u4e2d\u5df2\u7ecf\u88ab\u5220\u9664\u7684\u5206\u652f\u3002\u56e0\u4e3a\u5f00\u53d1\u8005\u901a\u5e38\u5728\u4e13\u9898\u5206\u652f\u7684\u4efb\u52a1\u5b8c\u6210\u540e\u4f1a\u5c06\u5176\u5220\u9664\u3002<\/p>\n
          \u4f7f\u7528\u8be5\u547d\u4ee4\u540e\uff0c\u624b\u5934\u7684\u4e2d\u592e\u4ed3\u5e93\u4e5f\u80fd\u5220\u9664\u4e0d\u5b58\u5728\u7684\u4e2d\u592e\u4ed3\u5e93\u5206\u652f\u3002<\/p>\n
          \u5f53\u4f60\u8f93\u5165git branch -v\u540e\uff0c\u4f1a\u5217\u51fa\u5206\u652f\u7684\u5217\u8868\u3002<\/p>\n
            dev\/topics\/integration    37f95b9f9 [gone] add integration test\r\n  dev\/topics\/topic3         711e639e2 [gone] adds unit test for logout feature\r\n  dev\/master                e8468657b initial poc load test\r\n<\/code><\/pre>\n
          \u6211\u53ef\u4ee5\u770b\u5230\u624b\u5934\u7684\u5206\u652f\u6b63\u5728\u8ffd\u8e2a\u4e00\u4e2a\u5df2\u7ecf\u4e0d\u5b58\u5728\u7684\u5206\u652f\u3002\u5728\u8fd9\u79cd\u60c5\u51b5\u4e0b\uff0c<\/p>\n
          git branch -d dev\/topics\/topic3\r\n<\/code><\/pre>\n
          \u5728\u7b49\u7b49\u5bf9\u5206\u652f\u8fdb\u884c\u6e05\u9664\u6216\u5220\u9664\u3002<\/p>\n
          \u4ee5\u4e0b\u662f\u4e2d\u6587\u7684\u91ca\u4e49\uff1a
          \n“\u30d6\u30e9\u30f3\u30c1\u304c” –> “\u5206\u652f\u5b58\u5728”<\/p>\n
          Git\u5206\u652f-v<\/h1>\n
          \u4e3a\u4e86\u4f7f\u6211\u4eec\u624b\u5934\u7684\u5206\u652f\u80fd\u591f\u8ddf\u8e2a\u5df2\u7ecf\u4e0d\u5b58\u5728\u7684\u4e2d\u592e\u4ed3\u5e93\u7684\u5206\u652f\uff0c\u6211\u4eec\u4f7f\u7528\u4e0a\u9762\u63d0\u5230\u7684\u65b9\u6cd5\u3002<\/p>\n
          \u5220\u9664 Git \u5206\u652f<\/h1>\n
          \u8fd9\u4e5f\u662f\u5df2\u7ecf\u63d0\u5230\u8fc7\u7684\uff0c\u5e0c\u671b\u5c3d\u91cf\u6e05\u7406\u624b\u5934\u7684\u5206\u652f\uff0c\u4ee5\u9632\u6b62\u6570\u91cf\u8fc7\u591a\u3002<\/p>\n
          \u603b\u7ed3<\/h1>\n
          \u6211\u5728\u6211\u4e2a\u4eba\u7684\u5de5\u4f5c\u6d41\u7a0b\u4e2d\u4ecb\u7ecd\u4e86\u4e00\u4e9b\u4e0d\u5e38\u7528\u7684Git\u547d\u4ee4\u548c\u7ecf\u5e38\u4f7f\u7528\u7684Git\u547d\u4ee4\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"
          \u58f0\u660e\uff1a\u8fd9\u4ec5\u4ec5\u662f\u4e2a\u4eba\u610f\u89c1\u3002 \u5728\u5fae\u8f6f\u603b\u90e8\u5de5\u4f5c\u4e866\u5e74\uff0c\u53c2\u4e0e\u4e86\u51e0\u4e2a\u4ea7\u54c1\u56e2\u961f\u7684\u5f00\u53d1\uff0c\u6211\u6709\u4e00\u4e9b\u611f\u609f\u3002 \u7528Git\u547d\u4ee4\u4e0d\u9700\u8981\u7684 […]<\/p>\n","protected":false},"author":9,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-37484","post","type-post","status-publish","format-standard","hentry","category-uncategorized"],"yoast_head":"\n\u5373\u4f7f\u65e0\u6cd5\u4f7f\u7528Git rebase\uff0c\u4e5f\u53ef\u4ee5\u3002\u53e6\u5916\uff0cGit cherry-pick\u548cGit merge -squash \u4e5f\u662f\u53ef\u4ee5\u7684 - Blog - Silicon Cloud<\/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.silicloud.com\/zh\/blog\/\u5373\u4f7f\u65e0\u6cd5\u4f7f\u7528git-rebase\uff0c\u4e5f\u53ef\u4ee5\u3002\u53e6\u5916\uff0cgit-cherry-pick\u548cgit-merge-squash-\u4e5f\u662f\/\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"\u5373\u4f7f\u65e0\u6cd5\u4f7f\u7528Git rebase\uff0c\u4e5f\u53ef\u4ee5\u3002\u53e6\u5916\uff0cGit cherry-pick\u548cGit merge --squash \u4e5f\u662f\u53ef\u4ee5\u7684\" \/>\n<meta property=\"og:description\" content=\"\u58f0\u660e\uff1a\u8fd9\u4ec5\u4ec5\u662f\u4e2a\u4eba\u610f\u89c1\u3002 \u5728\u5fae\u8f6f\u603b\u90e8\u5de5\u4f5c\u4e866\u5e74\uff0c\u53c2\u4e0e\u4e86\u51e0\u4e2a\u4ea7\u54c1\u56e2\u961f\u7684\u5f00\u53d1\uff0c\u6211\u6709\u4e00\u4e9b\u611f\u609f\u3002 \u7528Git\u547d\u4ee4\u4e0d\u9700\u8981\u7684 […]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.silicloud.com\/zh\/blog\/\u5373\u4f7f\u65e0\u6cd5\u4f7f\u7528git-rebase\uff0c\u4e5f\u53ef\u4ee5\u3002\u53e6\u5916\uff0cgit-cherry-pick\u548cgit-merge-squash-\u4e5f\u662f\/\" \/>\n<meta property=\"og:site_name\" content=\"Blog - Silicon Cloud\" \/>\n<meta property=\"article:published_time\" content=\"2023-07-11T04:39:46+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2024-05-03T21:01:40+00:00\" \/>\n<meta name=\"author\" content=\"\u6e05, \u626c\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:label1\" content=\"\u4f5c\u8005\" \/>\n\t<meta name=\"twitter:data1\" content=\"\u6e05, \u626c\" \/>\n\t<meta name=\"twitter:label2\" content=\"\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4\" \/>\n\t<meta name=\"twitter:data2\" content=\"1 \u5206\" \/>\n<script type=\"application\/ld+json\" class=\"yoast-schema-graph\">{\"@context\":\"https:\/\/schema.org\",\"@graph\":[{\"@type\":\"WebPage\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%8d%b3%e4%bd%bf%e6%97%a0%e6%b3%95%e4%bd%bf%e7%94%a8git-rebase%ef%bc%8c%e4%b9%9f%e5%8f%af%e4%bb%a5%e3%80%82%e5%8f%a6%e5%a4%96%ef%bc%8cgit-cherry-pick%e5%92%8cgit-merge-squash-%e4%b9%9f%e6%98%af\/\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%8d%b3%e4%bd%bf%e6%97%a0%e6%b3%95%e4%bd%bf%e7%94%a8git-rebase%ef%bc%8c%e4%b9%9f%e5%8f%af%e4%bb%a5%e3%80%82%e5%8f%a6%e5%a4%96%ef%bc%8cgit-cherry-pick%e5%92%8cgit-merge-squash-%e4%b9%9f%e6%98%af\/\",\"name\":\"\u5373\u4f7f\u65e0\u6cd5\u4f7f\u7528Git rebase\uff0c\u4e5f\u53ef\u4ee5\u3002\u53e6\u5916\uff0cGit cherry-pick\u548cGit merge -squash \u4e5f\u662f\u53ef\u4ee5\u7684 - Blog - Silicon Cloud\",\"isPartOf\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\"},\"datePublished\":\"2023-07-11T04:39:46+00:00\",\"dateModified\":\"2024-05-03T21:01:40+00:00\",\"author\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/cb5556d2501da73d864cac945e8d9461\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%8d%b3%e4%bd%bf%e6%97%a0%e6%b3%95%e4%bd%bf%e7%94%a8git-rebase%ef%bc%8c%e4%b9%9f%e5%8f%af%e4%bb%a5%e3%80%82%e5%8f%a6%e5%a4%96%ef%bc%8cgit-cherry-pick%e5%92%8cgit-merge-squash-%e4%b9%9f%e6%98%af\/#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%8d%b3%e4%bd%bf%e6%97%a0%e6%b3%95%e4%bd%bf%e7%94%a8git-rebase%ef%bc%8c%e4%b9%9f%e5%8f%af%e4%bb%a5%e3%80%82%e5%8f%a6%e5%a4%96%ef%bc%8cgit-cherry-pick%e5%92%8cgit-merge-squash-%e4%b9%9f%e6%98%af\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%8d%b3%e4%bd%bf%e6%97%a0%e6%b3%95%e4%bd%bf%e7%94%a8git-rebase%ef%bc%8c%e4%b9%9f%e5%8f%af%e4%bb%a5%e3%80%82%e5%8f%a6%e5%a4%96%ef%bc%8cgit-cherry-pick%e5%92%8cgit-merge-squash-%e4%b9%9f%e6%98%af\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.silicloud.com\/zh\/blog\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"\u5373\u4f7f\u65e0\u6cd5\u4f7f\u7528Git rebase\uff0c\u4e5f\u53ef\u4ee5\u3002\u53e6\u5916\uff0cGit cherry-pick\u548cGit merge –squash \u4e5f\u662f\u53ef\u4ee5\u7684\"}]},{\"@type\":\"WebSite\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/\",\"name\":\"Blog - Silicon Cloud\",\"description\":\"\",\"inLanguage\":\"zh-Hans\"},{\"@type\":\"Person\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/cb5556d2501da73d864cac945e8d9461\",\"name\":\"\u6e05, \u626c\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/secure.gravatar.com\/avatar\/32a4239de8ff29adace466261d309424a1e5fe9f7e3036bf89fe03f2e3dbe717?s=96&d=mm&r=g\",\"contentUrl\":\"https:\/\/secure.gravatar.com\/avatar\/32a4239de8ff29adace466261d309424a1e5fe9f7e3036bf89fe03f2e3dbe717?s=96&d=mm&r=g\",\"caption\":\"\u6e05, \u626c\"},\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/author\/qingyang\/\"},{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%8d%b3%e4%bd%bf%e6%97%a0%e6%b3%95%e4%bd%bf%e7%94%a8git-rebase%ef%bc%8c%e4%b9%9f%e5%8f%af%e4%bb%a5%e3%80%82%e5%8f%a6%e5%a4%96%ef%bc%8cgit-cherry-pick%e5%92%8cgit-merge-squash-%e4%b9%9f%e6%98%af\/#local-main-organization-logo\",\"url\":\"\",\"contentUrl\":\"\",\"caption\":\"Blog - Silicon Cloud\"}]}<\/script>\n<!-- \/ Yoast SEO Premium plugin. -->","yoast_head_json":{"title":"\u5373\u4f7f\u65e0\u6cd5\u4f7f\u7528Git rebase\uff0c\u4e5f\u53ef\u4ee5\u3002\u53e6\u5916\uff0cGit cherry-pick\u548cGit merge -squash \u4e5f\u662f\u53ef\u4ee5\u7684 - Blog - Silicon Cloud","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.silicloud.com\/zh\/blog\/\u5373\u4f7f\u65e0\u6cd5\u4f7f\u7528git-rebase\uff0c\u4e5f\u53ef\u4ee5\u3002\u53e6\u5916\uff0cgit-cherry-pick\u548cgit-merge-squash-\u4e5f\u662f\/","og_locale":"zh_CN","og_type":"article","og_title":"\u5373\u4f7f\u65e0\u6cd5\u4f7f\u7528Git rebase\uff0c\u4e5f\u53ef\u4ee5\u3002\u53e6\u5916\uff0cGit cherry-pick\u548cGit merge --squash \u4e5f\u662f\u53ef\u4ee5\u7684","og_description":"\u58f0\u660e\uff1a\u8fd9\u4ec5\u4ec5\u662f\u4e2a\u4eba\u610f\u89c1\u3002 \u5728\u5fae\u8f6f\u603b\u90e8\u5de5\u4f5c\u4e866\u5e74\uff0c\u53c2\u4e0e\u4e86\u51e0\u4e2a\u4ea7\u54c1\u56e2\u961f\u7684\u5f00\u53d1\uff0c\u6211\u6709\u4e00\u4e9b\u611f\u609f\u3002 \u7528Git\u547d\u4ee4\u4e0d\u9700\u8981\u7684 […]","og_url":"https:\/\/www.silicloud.com\/zh\/blog\/\u5373\u4f7f\u65e0\u6cd5\u4f7f\u7528git-rebase\uff0c\u4e5f\u53ef\u4ee5\u3002\u53e6\u5916\uff0cgit-cherry-pick\u548cgit-merge-squash-\u4e5f\u662f\/","og_site_name":"Blog - Silicon Cloud","article_published_time":"2023-07-11T04:39:46+00:00","article_modified_time":"2024-05-03T21:01:40+00:00","author":"\u6e05, \u626c","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"\u6e05, \u626c","\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4":"1 \u5206"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"WebPage","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%8d%b3%e4%bd%bf%e6%97%a0%e6%b3%95%e4%bd%bf%e7%94%a8git-rebase%ef%bc%8c%e4%b9%9f%e5%8f%af%e4%bb%a5%e3%80%82%e5%8f%a6%e5%a4%96%ef%bc%8cgit-cherry-pick%e5%92%8cgit-merge-squash-%e4%b9%9f%e6%98%af\/","url":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%8d%b3%e4%bd%bf%e6%97%a0%e6%b3%95%e4%bd%bf%e7%94%a8git-rebase%ef%bc%8c%e4%b9%9f%e5%8f%af%e4%bb%a5%e3%80%82%e5%8f%a6%e5%a4%96%ef%bc%8cgit-cherry-pick%e5%92%8cgit-merge-squash-%e4%b9%9f%e6%98%af\/","name":"\u5373\u4f7f\u65e0\u6cd5\u4f7f\u7528Git rebase\uff0c\u4e5f\u53ef\u4ee5\u3002\u53e6\u5916\uff0cGit cherry-pick\u548cGit merge -squash \u4e5f\u662f\u53ef\u4ee5\u7684 - Blog - Silicon Cloud","isPartOf":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website"},"datePublished":"2023-07-11T04:39:46+00:00","dateModified":"2024-05-03T21:01:40+00:00","author":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/cb5556d2501da73d864cac945e8d9461"},"breadcrumb":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%8d%b3%e4%bd%bf%e6%97%a0%e6%b3%95%e4%bd%bf%e7%94%a8git-rebase%ef%bc%8c%e4%b9%9f%e5%8f%af%e4%bb%a5%e3%80%82%e5%8f%a6%e5%a4%96%ef%bc%8cgit-cherry-pick%e5%92%8cgit-merge-squash-%e4%b9%9f%e6%98%af\/#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.silicloud.com\/zh\/blog\/%e5%8d%b3%e4%bd%bf%e6%97%a0%e6%b3%95%e4%bd%bf%e7%94%a8git-rebase%ef%bc%8c%e4%b9%9f%e5%8f%af%e4%bb%a5%e3%80%82%e5%8f%a6%e5%a4%96%ef%bc%8cgit-cherry-pick%e5%92%8cgit-merge-squash-%e4%b9%9f%e6%98%af\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%8d%b3%e4%bd%bf%e6%97%a0%e6%b3%95%e4%bd%bf%e7%94%a8git-rebase%ef%bc%8c%e4%b9%9f%e5%8f%af%e4%bb%a5%e3%80%82%e5%8f%a6%e5%a4%96%ef%bc%8cgit-cherry-pick%e5%92%8cgit-merge-squash-%e4%b9%9f%e6%98%af\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.silicloud.com\/zh\/blog\/"},{"@type":"ListItem","position":2,"name":"\u5373\u4f7f\u65e0\u6cd5\u4f7f\u7528Git rebase\uff0c\u4e5f\u53ef\u4ee5\u3002\u53e6\u5916\uff0cGit cherry-pick\u548cGit merge –squash \u4e5f\u662f\u53ef\u4ee5\u7684"}]},{"@type":"WebSite","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website","url":"https:\/\/www.silicloud.com\/zh\/blog\/","name":"Blog - Silicon Cloud","description":"","inLanguage":"zh-Hans"},{"@type":"Person","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/cb5556d2501da73d864cac945e8d9461","name":"\u6e05, \u626c","image":{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/","url":"https:\/\/secure.gravatar.com\/avatar\/32a4239de8ff29adace466261d309424a1e5fe9f7e3036bf89fe03f2e3dbe717?s=96&d=mm&r=g","contentUrl":"https:\/\/secure.gravatar.com\/avatar\/32a4239de8ff29adace466261d309424a1e5fe9f7e3036bf89fe03f2e3dbe717?s=96&d=mm&r=g","caption":"\u6e05, \u626c"},"url":"https:\/\/www.silicloud.com\/zh\/blog\/author\/qingyang\/"},{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%8d%b3%e4%bd%bf%e6%97%a0%e6%b3%95%e4%bd%bf%e7%94%a8git-rebase%ef%bc%8c%e4%b9%9f%e5%8f%af%e4%bb%a5%e3%80%82%e5%8f%a6%e5%a4%96%ef%bc%8cgit-cherry-pick%e5%92%8cgit-merge-squash-%e4%b9%9f%e6%98%af\/#local-main-organization-logo","url":"","contentUrl":"","caption":"Blog - Silicon Cloud"}]}},"_links":{"self":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37484","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/users\/9"}],"replies":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/comments?post=37484"}],"version-history":[{"count":2,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37484\/revisions"}],"predecessor-version":[{"id":96269,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37484\/revisions\/96269"}],"wp:attachment":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/media?parent=37484"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/categories?post=37484"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/tags?post=37484"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}