{"id":37810,"date":"2022-11-18T21:24:05","date_gmt":"2023-04-29T10:45:25","guid":{"rendered":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit-merge%e5%92%8cgit-rebase%e7%9a%84%e5%8c%ba%e5%88%ab%e3%80%82\/"},"modified":"2024-04-29T01:20:09","modified_gmt":"2024-04-28T17:20:09","slug":"%e5%85%b3%e4%ba%8egit-merge%e5%92%8cgit-rebase%e7%9a%84%e5%8c%ba%e5%88%ab%e3%80%82","status":"publish","type":"post","link":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit-merge%e5%92%8cgit-rebase%e7%9a%84%e5%8c%ba%e5%88%ab%e3%80%82\/","title":{"rendered":"\u5173\u4e8egit merge\u548cgit rebase\u7684\u533a\u522b"},"content":{"rendered":"<h1>\u9996\u5148<\/h1>\n<p>\u6211\u662fDMM WEBCAMP Advent Calendar 2023\u7b2c9\u5929\u7684\u6307\u5bfc\u8005@72_mikan\u3002<br \/>\n\u4e3a\u4e86\u7406\u89e3git\uff0c\u6211\u60f3\u8c08\u8c08\u8fd9\u6b21\u5173\u4e8egit merge\u548crebase\u7684\u5185\u5bb9\u3002<\/p>\n<h1>\u6d41\u52a8 (li\u00fa<\/h1>\n<ul class=\"post-ul\">\n<li style=\"list-style-type: none;\">\n<ul class=\"post-ul\">git merge\u306b\u3064\u3044\u3066<\/ul>\n<\/li>\n<\/ul>\n<p>&nbsp;<\/p>\n<ul class=\"post-ul\">\n<li style=\"list-style-type: none;\">\n<ul class=\"post-ul\">git rebase\u306b\u3064\u3044\u3066<\/ul>\n<\/li>\n<\/ul>\n<p>&nbsp;<\/p>\n<ul class=\"post-ul\">git merge\u3068git rebase<\/ul>\n<h1>\u5173\u4e8egit merge\u7684\u5185\u5bb9<\/h1>\n<p>\u7531\u65bc\u95b1\u8b80\u9019\u7bc7\u6587\u7ae0\u7684\u4eba\u4e2d\u53ef\u80fd\u6709\u4e9b\u4eba\u5f9e\u672a\u5206\u652f\u904e\u7a0b\u5f0f\u78bc\uff0c\u6240\u4ee5\u6211\u60f3\u5148\u89e3\u91cb\u4e00\u4e0b\u5982\u4f55\u5206\u652f\u3002\u5206\u652f\u6307\u7684\u662f\u5728\u958b\u767c\u904e\u7a0b\u4e2d\u5275\u5efa\u7684\u4efb\u52d9\u62c6\u5206\u3002<br \/>\n\u901a\u904e\u5206\u652f\uff0c\u6211\u5011\u53ef\u4ee5\u540c\u6642\u9032\u884c\u4e26\u884c\u958b\u767c\uff0c\u800c\u5206\u652f\u4e4b\u9593\u4e92\u4e0d\u5e72\u64fe\u3002<br \/>\n\u8209\u500b\u4f8b\u5b50\uff0c\u5047\u8a2d\u6211\u5011\u5f9e\u4e3b\u5206\u652f\uff08main branch\uff09\u5275\u5efa\u4e86task1\u5206\u652f\u548ctask2\u5206\u652f\uff08\u5206\u652f\u5275\u5efa\u4e5f\u53ef\u4ee5\u7a31\u4f5c\u5206\u5272\u5206\u652f\uff09\u3002<br \/>\n\uff08\u5728\u4e3b\u5206\u652f\u7684\u72c0\u614b\u4e0b\uff0c\u5206\u5225\u5b58\u5728index-1.html\u548cindex-2.html\u6587\u4ef6\u3002\uff09<br \/>\n\u5f9e\u90a3\u4e4b\u5f8c\uff0c\u5207\u63db\u5230task1\u5206\u652f\u4e26\u7de8\u8f2findex-1.html\uff0c\u5373\u4f7f\u6211\u5011\u5207\u63db\u56de\u4e3b\u5206\u652f\u6216task2\u5206\u652f\uff0cindex-1.html\u7684\u7de8\u8f2f\u5167\u5bb9\u5c07\u4e0d\u6703\u53cd\u6620\u5728\u4e3b\u5206\u652f\u6216task2\u5206\u652f\u4e0a\u3002<br \/>\n\u53cd\u4e4b\uff0c\u5728task2\u5206\u652f\u7de8\u8f2findex-2.html\uff0c\u4e5f\u4e0d\u6703\u5f71\u97ff\u5230\u4e3b\u5206\u652f\u6216task1\u5206\u652f\u3002<br \/>\n\u901a\u904e\u9019\u7a2e\u65b9\u5f0f\uff0c\u6211\u5011\u53ef\u4ee5\u5728task1\u5206\u652f\u4e0a\u9032\u884c\u529f\u80fd\u6dfb\u52a0\u7b49\u64cd\u4f5c\uff0c\u5728task2\u5206\u652f\u4e0a\u9032\u884c\u932f\u8aa4\u4fee\u6b63\u7b49\u64cd\u4f5c\uff0c\u5be6\u73fe\u540c\u6642\u4e26\u767c\u7684\u5de5\u4f5c\u3002<\/p>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d30ba37434c4406c5cd90\/6-0.png\" alt=\"branch.png\" \/><\/div>\n<pre class=\"post-pre\"><code># \u30d6\u30e9\u30f3\u30c1\u4f5c\u6210\u30b3\u30de\u30f3\u30c9\r\ngit branch \u30d6\u30e9\u30f3\u30c1\u540d\r\n\r\n# \u30d6\u30e9\u30f3\u30c1\u5207\u308a\u66ff\u3048\r\ngit checkout \u30d6\u30e9\u30f3\u30c1\u540d\r\n<\/code><\/pre>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d30ba37434c4406c5cd90\/8-0.png\" alt=\"fastfoward.png\" \/><\/div>\n<p>\u5047\u8bbe\u6211\u4eec\u4ece\u4e3b\u5206\u652f\u521b\u5efa\u4e86\u4e00\u4e2a\u540d\u4e3atask1\u7684\u5206\u652f\uff0c\u5e76\u5728task1\u5206\u652f\u4e0a\u8fdb\u884c\u5f00\u53d1\u3002\u5f53\u6211\u4eec\u60f3\u8981\u5c06task1\u7684\u5de5\u4f5c\u5185\u5bb9\u5408\u5e76\u5230\u4e3b\u5206\u652f\u65f6\uff0c\u53ef\u4ee5\u8fdb\u884c\u5408\u5e76\u64cd\u4f5c\uff0c\u8fd9\u6837\u4e3b\u5206\u652f\u5c31\u53ef\u4ee5\u5c06task1\u7684\u5185\u5bb9\u5408\u5e76\u8fdb\u53bb\u4e86\u3002<\/p>\n<p>\u5408\u5e76\u7684\u6b65\u9aa4\u5982\u4e0b\u6240\u793a\u3002<\/p>\n<pre class=\"post-pre\"><code># main\u30d6\u30e9\u30f3\u30c1\u306b\u3044\u308b\u3068\u3057\u307e\u3059\u3002\r\ngit merge task1\r\n<\/code><\/pre>\n<p>\u53e6\u5916\uff0c\u5408\u5e76\u7684\u7c7b\u578b\u6709\u4e09\u79cd\u3002\u6211\u60f3\u8981\u5206\u522b\u8fdb\u884c\u89e3\u91ca\u3002<\/p>\n<p>\u9996\u5148\uff0c\u7b2c\u4e00\u90e8\u5206\u662f\u201cFast Forward\u201d\u3002Fast Forward \u662f\u6307\u6839\u636e\u4e0a\u8ff0 merge \u7684\u8bf4\u660e\uff0c\u5c06\u8981\u5408\u5e76\u7684\u5206\u652f\uff08\u5728\u6b64\u6307\u4e3b\u5206\u652f\uff09\u524d\u8fdb\u5230\u6307\u5b9a\u4f4d\u7f6e\uff08\u5728\u6b64\u6307\u4efb\u52a11\u5206\u652f\u7684\u4f4d\u7f6e\uff09\u3002<\/p>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d30ba37434c4406c5cd90\/14-0.png\" alt=\"automerge.png\" \/><\/div>\n<p>\u5f53main\u5206\u652f\u8bd5\u56fe\u5408\u5e76task\u5206\u652f\u65f6\uff0c\u5982\u679c\u4ece\u4f4d\u7f6eA\u5206\u53c9\u51fa\u4e86\u4e24\u4e2a\u5206\u652f\uff0c\u5176\u4e2d\u4e00\u4e2a\u5206\u652f\u6709B\u6b21\u63d0\u4ea4\uff0c\u53e6\u4e00\u4e2a\u5206\u652f\u6709C\u6b21\u63d0\u4ea4\uff0cAuto Merge\u4f1a\u521b\u5efa\u4e00\u4e2a\u65b0\u7684D\u6b21\u63d0\u4ea4\uff0c\u5e76\u5c06\u4e3b\u5206\u652f\u79fb\u52a8\u5230D\u6b21\u63d0\u4ea4\uff0c\u4ee5\u5c06task\u5206\u652f\u5408\u5e76\u5230\u4e3b\u5206\u652f\u3002\u8fd9\u662f\u4e00\u79cd\u7ecf\u5e38\u60f3\u8c61\u5f97\u5230\u7684\u5408\u5e76\u8fc7\u7a0b\u3002<\/p>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d30ba37434c4406c5cd90\/16-0.png\" alt=\"conflict.png\" \/><\/div>\n<pre class=\"post-pre\"><code>\u3053\u3093\u306b\u3061\u306f\uff01\r\n<\/code><\/pre>\n<p>\u4eceA\u63d0\u4ea4\u521b\u5efa\u5206\u652f\uff0ctask\u5206\u652f\u4e0a\u6709B\u6b21\u63d0\u4ea4\uff0cmain\u5206\u652f\u4e0a\u6709C\u6b21\u63d0\u4ea4\u3002<br \/>\n\u5728task\u5206\u652f\u4e2d\u6309\u4ee5\u4e0b\u65b9\u5f0f\u7f16\u8f91\u4e86\u6587\u4ef6\u3002<\/p>\n<pre class=\"post-pre\"><code>\u3053\u3093\u306b\u3061\u306f\uff01\r\nconflict\u3092\u89e3\u6d88\u3057\u3088\u3046\uff01\uff01\r\n<\/code><\/pre>\n<p>\u5047\u8bbe\u5728\u4e3b\u5206\u652f\u4e0a\uff0c\u6211\u4eec\u5bf9\u6587\u4ef6\u8fdb\u884c\u5982\u4e0b\u7f16\u8f91\u3002<\/p>\n<pre class=\"post-pre\"><code>\u3053\u3093\u306b\u3061\u306f\uff01\r\n\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u89e3\u6d88\u3057\u3088\u3046\uff01\uff01\r\n<\/code><\/pre>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d30ba37434c4406c5cd90\/22-0.png\" alt=\"image.png\" \/><\/div>\n<p>\u4e3a\u4ec0\u4e48\u4f1a\u53d1\u751f\u8fd9\u79cd\u60c5\u51b5\uff1f<br \/>\n\u8fd9\u662f\u56e0\u4e3a\u5728\u4e3b\u5206\u652f\u548c\u4efb\u52a1\u5206\u652f\u4e2d\u5bf9\u540c\u4e00\u90e8\u5206\u8fdb\u884c\u4e86\u7f16\u8f91\u3002\u8fd9\u6b21\u6211\u8ba4\u4e3a\u5728\u6bcf\u4e2a\u5206\u652f\u7684file.txt\u7684\u7b2c\u4e8c\u884c\u8fdb\u884c\u4e86\u4e0d\u540c\u7684\u7f16\u8f91\u3002\u7531\u4e8egit\u65e0\u6cd5\u786e\u5b9a\u5728\u6bcf\u4e2a\u5206\u652f\u4e0a\u8fdb\u884c\u4e86\u76f8\u540c\u7684\u7f16\u8f91\uff0c\u65e0\u6cd5\u786e\u5b9a\u5e94\u4f18\u5148\u91c7\u7528\u54ea\u4e2a\u5206\u652f\u7684\u7f16\u8f91\u5185\u5bb9\uff0c\u4ece\u800c\u5bfc\u81f4\u51b2\u7a81\u7684\u53d1\u751f\u3002<\/p>\n<p>\u63a5\u4e0b\u6765\uff0c\u6211\u60f3\u89e3\u91ca\u4e00\u4e0b\u89e3\u51b3\u51b2\u7a81\u7684\u65b9\u6cd5\u3002<\/p>\n<p>\u6211\u8ba4\u4e3a\u6587\u4ef6.txt\u4e2d\u7684\u5185\u5bb9\u5982\u4e0b\uff1a<\/p>\n<pre class=\"post-pre\"><code>\u3053\u3093\u306b\u3061\u306f\uff01\r\n&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD\r\n\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u89e3\u6d88\u3057\u3088\u3046\uff01\uff01\r\n=======\r\nconflict\u3092\u89e3\u6d88\u3057\u3088\u3046\uff01\uff01\r\n&gt;&gt;&gt;&gt;&gt;&gt;&gt; task\r\n<\/code><\/pre>\n<p>\u5f53\u53d1\u751f\u51b2\u7a81\u65f6\uff0c\u4e3b\u8981\u5206\u652f\uff08\u5df2\u5408\u5e76\u7684\u5206\u652f\uff09\u5c06\u5728HEAD\u90e8\u5206\u663e\u793a\uff0c\u5e76\u4e14\u4efb\u52a1\u5206\u652f\uff08\u5df2\u5408\u5e76\u7684\u5206\u652f\uff09\u5c06\u88ab\u8f93\u51fa\u3002<br \/>\n\u7531\u4e8e\u65e0\u6cd5\u5224\u65ad\u54ea\u4e2a\u5206\u652f\u4f18\u5148\uff0c\u56e0\u6b64\u672c\u6b21\u5c06\u7f16\u8f91\u4e3a\u4f18\u5148\u91c7\u7528\u5df2\u5408\u5e76\u7684\u4efb\u52a1\u5206\u652f\u3002<\/p>\n<pre class=\"post-pre\"><code>\u3053\u3093\u306b\u3061\u306f\uff01\r\nconflict\u3092\u89e3\u6d88\u3057\u3088\u3046\uff01\uff01\r\n<\/code><\/pre>\n<p>\u6267\u884c\u4ee5\u4e0b\u547d\u4ee4\u540e\uff0c\u51b2\u7a81\u5c06\u5f97\u4ee5\u89e3\u51b3\u3002<\/p>\n<pre class=\"post-pre\"><code>git add file.txt\r\ngit commit -m 'conflict\u306e\u89e3\u6d88'\r\n<\/code><\/pre>\n<p>\u4ee5\u4e0a\u662f\u5173\u4e8e\u51b2\u7a81\u7684\u89e3\u91ca\u3002<\/p>\n<h1>\u5173\u4e8egit rebase<\/h1>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d30ba37434c4406c5cd90\/33-0.png\" alt=\"merge1.png\" \/><\/div>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d30ba37434c4406c5cd90\/34-0.png\" alt=\"merge2.png\" \/><\/div>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d30ba37434c4406c5cd90\/35-0.png\" alt=\"rebase.png\" \/><\/div>\n<p>\u4ee5\u4e0b\u662frebase\u547d\u4ee4\u7684\u9009\u9879\uff1a<\/p>\n<pre class=\"post-pre\"><code># main\u30d6\u30e9\u30f3\u30c1\u306b\u3044\u308b\u72b6\u614b\u3068\u4eee\u5b9a\u3057\u307e\u3059\r\ngit checkout task # task\u30d6\u30e9\u30f3\u30c1\u306b\u5207\u308a\u66ff\u3048\u307e\u3059\r\n\r\ngit rebase main # task\u30d6\u30e9\u30f3\u30c1\u3067rebase\u30b3\u30de\u30f3\u30c9\u3092\u4f7f\u3044\u307e\u3059\r\n\r\ngit checkout main # main\u30d6\u30e9\u30f3\u30c1\u306b\u5207\u308a\u66ff\u3048\r\n\r\ngit merge task # \u524d\u306b\u9032\u3093\u3067\u3044\u308btask\u30d6\u30e9\u30f3\u30c1\u3092main\u30d6\u30e9\u30f3\u30c1\u3067\u53d6\u308a\u8fbc\u307ftask\u30d6\u30e9\u30f3\u30c1\u3068\u540c\u3058\u30b3\u30df\u30c3\u30c8\u306b\u79fb\u52d5\r\n<\/code><\/pre>\n<p>\u901a\u8fc7\u8fd9\u6837\u505a\uff0c\u53ef\u4ee5\u5c06\u63d0\u4ea4\u8bb0\u5f55\u5408\u5e76\u6210\u4e00\u5217\u3002<\/p>\n<h1>git merge\u548cgit rebase\u6709\u4ec0\u4e48\u533a\u522b\uff1f<\/h1>\n<p>\u6700\u540e\uff0crebase\u548cmerge\u7684\u533a\u522b\u5728\u4e8e\u80fd\u5426\u5c06\u63d0\u4ea4\u6574\u7406\u5f97\u66f4\u52a0\u6e05\u6670\u3002merge\u7684\u60c5\u51b5\u4e0b\uff0c\u7531\u4e8e\u4f1a\u521b\u5efa\u65b0\u7684\u63d0\u4ea4\uff0c\u63d0\u4ea4\u5386\u53f2\u5c31\u4f1a\u53d8\u5f97\u5206\u6563\uff1b\u800c\u5728rebase\u7684\u60c5\u51b5\u4e0b\uff0c\u53ef\u4ee5\u5c06\u63d0\u4ea4\u5386\u53f2\u6574\u7406\u6210\u4e00\u6761\u7ebf\u3002<\/p>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d30ba37434c4406c5cd90\/41-0.png\" alt=\"merge1.png\" \/><\/div>\n<p>\u5047\u8bbe\u4e3b\u5206\u652f\u548c\u4efb\u52a1\u5206\u652f\u5df2\u7ecf\u88ab\u63a8\u9001\uff0c\u5982\u679c\u5728\u8fd9\u91cc\u4f7f\u7528\u4efb\u52a1\u5206\u652f\u8fdb\u884crebase\uff0c\u90a3\u4e48D\u63d0\u4ea4\u7684\u7236\u5206\u652f\u5c06\u6210\u4e3aC\u63d0\u4ea4\u3002<br \/>\n\u7136\u800c\uff0c\u5728\u63a8\u9001\u65f6\uff0cD\u63d0\u4ea4\u7684\u7236\u63d0\u4ea4\u662fA\u63d0\u4ea4\uff0c\u56e0\u6b64\u6b64\u65f6\u8fdc\u7a0b\u4ed3\u5e93\u548c\u672c\u5730\u4ed3\u5e93\u7684\u63d0\u4ea4\u5386\u53f2\u5c06\u53d8\u5f97\u6df7\u4e71\u3002<\/p>\n<p>\u5728\u4f7f\u7528rebase\u65f6\uff0c\u8bf7\u786e\u4fdd\u5728\u5c1a\u672a\u5c06\u5206\u652f\u63a8\u9001\u5230git\u4e4b\u524d\u8fdb\u884c\u64cd\u4f5c\u3002<\/p>\n<h1>\u6700\u540e<\/h1>\n<p>\u60a8\u89c9\u5f97\u5982\u4f55\u5462\uff1f\u5982\u679c\u6709\u4efb\u4f55\u5f15\u8d77\u60a8\u5174\u8da3\u7684\u95ee\u9898\uff0c\u8bf7\u7559\u4e0b\u8bc4\u8bba\u6216\u5176\u4ed6\u53cd\u9988\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u9996\u5148 \u6211\u662fDMM WEBCAMP Advent Calendar 2023\u7b2c9\u5929\u7684\u6307\u5bfc\u8005@72_mikan\u3002  [&hellip;]<\/p>\n","protected":false},"author":8,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-37810","post","type-post","status-publish","format-standard","hentry","category-uncategorized"],"yoast_head":"<!-- This site is optimized with the Yoast SEO Premium plugin v21.5 (Yoast SEO v21.5) - https:\/\/yoast.com\/wordpress\/plugins\/seo\/ -->\n<title>\u5173\u4e8egit merge\u548cgit rebase\u7684\u533a\u522b - 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\/\u5173\u4e8egit-merge\u548cgit-rebase\u7684\u533a\u522b\u3002\/\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"\u5173\u4e8egit merge\u548cgit rebase\u7684\u533a\u522b\" \/>\n<meta property=\"og:description\" content=\"\u9996\u5148 \u6211\u662fDMM WEBCAMP Advent Calendar 2023\u7b2c9\u5929\u7684\u6307\u5bfc\u8005@72_mikan\u3002 [&hellip;]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.silicloud.com\/zh\/blog\/\u5173\u4e8egit-merge\u548cgit-rebase\u7684\u533a\u522b\u3002\/\" \/>\n<meta property=\"og:site_name\" content=\"Blog - Silicon Cloud\" \/>\n<meta property=\"article:published_time\" content=\"2023-04-29T10:45:25+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2024-04-28T17:20:09+00:00\" \/>\n<meta property=\"og:image\" content=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d30ba37434c4406c5cd90\/6-0.png\" \/>\n<meta name=\"author\" content=\"\u96c5, \u609f\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:label1\" content=\"\u4f5c\u8005\" \/>\n\t<meta name=\"twitter:data1\" content=\"\u96c5, \u609f\" \/>\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%85%b3%e4%ba%8egit-merge%e5%92%8cgit-rebase%e7%9a%84%e5%8c%ba%e5%88%ab%e3%80%82\/\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit-merge%e5%92%8cgit-rebase%e7%9a%84%e5%8c%ba%e5%88%ab%e3%80%82\/\",\"name\":\"\u5173\u4e8egit merge\u548cgit rebase\u7684\u533a\u522b - Blog - Silicon Cloud\",\"isPartOf\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\"},\"datePublished\":\"2023-04-29T10:45:25+00:00\",\"dateModified\":\"2024-04-28T17:20:09+00:00\",\"author\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/f044a4b7fa4ee2701702942002419ca6\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit-merge%e5%92%8cgit-rebase%e7%9a%84%e5%8c%ba%e5%88%ab%e3%80%82\/#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit-merge%e5%92%8cgit-rebase%e7%9a%84%e5%8c%ba%e5%88%ab%e3%80%82\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit-merge%e5%92%8cgit-rebase%e7%9a%84%e5%8c%ba%e5%88%ab%e3%80%82\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.silicloud.com\/zh\/blog\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"\u5173\u4e8egit merge\u548cgit rebase\u7684\u533a\u522b\"}]},{\"@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\/f044a4b7fa4ee2701702942002419ca6\",\"name\":\"\u96c5, \u609f\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/secure.gravatar.com\/avatar\/e71a913e914f1aad1efc391f92084294bac54bc782acd289638580134cf667a6?s=96&d=mm&r=g\",\"contentUrl\":\"https:\/\/secure.gravatar.com\/avatar\/e71a913e914f1aad1efc391f92084294bac54bc782acd289638580134cf667a6?s=96&d=mm&r=g\",\"caption\":\"\u96c5, \u609f\"},\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/author\/yawu\/\"},{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit-merge%e5%92%8cgit-rebase%e7%9a%84%e5%8c%ba%e5%88%ab%e3%80%82\/#local-main-organization-logo\",\"url\":\"\",\"contentUrl\":\"\",\"caption\":\"Blog - Silicon Cloud\"}]}<\/script>\n<!-- \/ Yoast SEO Premium plugin. -->","yoast_head_json":{"title":"\u5173\u4e8egit merge\u548cgit rebase\u7684\u533a\u522b - 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\/\u5173\u4e8egit-merge\u548cgit-rebase\u7684\u533a\u522b\u3002\/","og_locale":"zh_CN","og_type":"article","og_title":"\u5173\u4e8egit merge\u548cgit rebase\u7684\u533a\u522b","og_description":"\u9996\u5148 \u6211\u662fDMM WEBCAMP Advent Calendar 2023\u7b2c9\u5929\u7684\u6307\u5bfc\u8005@72_mikan\u3002 [&hellip;]","og_url":"https:\/\/www.silicloud.com\/zh\/blog\/\u5173\u4e8egit-merge\u548cgit-rebase\u7684\u533a\u522b\u3002\/","og_site_name":"Blog - Silicon Cloud","article_published_time":"2023-04-29T10:45:25+00:00","article_modified_time":"2024-04-28T17:20:09+00:00","og_image":[{"url":"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d30ba37434c4406c5cd90\/6-0.png"}],"author":"\u96c5, \u609f","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"\u96c5, \u609f","\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4":"1 \u5206"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"WebPage","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit-merge%e5%92%8cgit-rebase%e7%9a%84%e5%8c%ba%e5%88%ab%e3%80%82\/","url":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit-merge%e5%92%8cgit-rebase%e7%9a%84%e5%8c%ba%e5%88%ab%e3%80%82\/","name":"\u5173\u4e8egit merge\u548cgit rebase\u7684\u533a\u522b - Blog - Silicon Cloud","isPartOf":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website"},"datePublished":"2023-04-29T10:45:25+00:00","dateModified":"2024-04-28T17:20:09+00:00","author":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/f044a4b7fa4ee2701702942002419ca6"},"breadcrumb":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit-merge%e5%92%8cgit-rebase%e7%9a%84%e5%8c%ba%e5%88%ab%e3%80%82\/#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit-merge%e5%92%8cgit-rebase%e7%9a%84%e5%8c%ba%e5%88%ab%e3%80%82\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit-merge%e5%92%8cgit-rebase%e7%9a%84%e5%8c%ba%e5%88%ab%e3%80%82\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.silicloud.com\/zh\/blog\/"},{"@type":"ListItem","position":2,"name":"\u5173\u4e8egit merge\u548cgit rebase\u7684\u533a\u522b"}]},{"@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\/f044a4b7fa4ee2701702942002419ca6","name":"\u96c5, \u609f","image":{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/","url":"https:\/\/secure.gravatar.com\/avatar\/e71a913e914f1aad1efc391f92084294bac54bc782acd289638580134cf667a6?s=96&d=mm&r=g","contentUrl":"https:\/\/secure.gravatar.com\/avatar\/e71a913e914f1aad1efc391f92084294bac54bc782acd289638580134cf667a6?s=96&d=mm&r=g","caption":"\u96c5, \u609f"},"url":"https:\/\/www.silicloud.com\/zh\/blog\/author\/yawu\/"},{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit-merge%e5%92%8cgit-rebase%e7%9a%84%e5%8c%ba%e5%88%ab%e3%80%82\/#local-main-organization-logo","url":"","contentUrl":"","caption":"Blog - Silicon Cloud"}]}},"_links":{"self":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37810","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\/8"}],"replies":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/comments?post=37810"}],"version-history":[{"count":2,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37810\/revisions"}],"predecessor-version":[{"id":71221,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37810\/revisions\/71221"}],"wp:attachment":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/media?parent=37810"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/categories?post=37810"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/tags?post=37810"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}