{"id":37759,"date":"2023-07-17T09:45:32","date_gmt":"2023-02-10T21:02:55","guid":{"rendered":"https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e5%9f%ba%e7%a1%80%e3%80%91%e5%9c%a8git-merge%e5%92%8cgit-rebase%e4%b8%ad%ef%bc%8c%e5%bd%93%e5%87%ba%e7%8e%b0%e5%86%b2%e7%aa%81%e6%97%b6%ef%bc%8chead%e5%88%86%e6%94%af%e7%9a%84%e4%b8%80\/"},"modified":"2024-04-30T14:00:05","modified_gmt":"2024-04-30T06:00:05","slug":"%e3%80%90git%e5%9f%ba%e7%a1%80%e3%80%91%e5%9c%a8git-merge%e5%92%8cgit-rebase%e4%b8%ad%ef%bc%8c%e5%bd%93%e5%87%ba%e7%8e%b0%e5%86%b2%e7%aa%81%e6%97%b6%ef%bc%8chead%e5%88%86%e6%94%af%e7%9a%84%e4%b8%80","status":"publish","type":"post","link":"https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e5%9f%ba%e7%a1%80%e3%80%91%e5%9c%a8git-merge%e5%92%8cgit-rebase%e4%b8%ad%ef%bc%8c%e5%bd%93%e5%87%ba%e7%8e%b0%e5%86%b2%e7%aa%81%e6%97%b6%ef%bc%8chead%e5%88%86%e6%94%af%e7%9a%84%e4%b8%80\/","title":{"rendered":"\u3010Git\u57fa\u7840\u3011\u5728git merge\u548cgit rebase\u4e2d\uff0c\u5f53\u51fa\u73b0\u51b2\u7a81\u65f6\uff0cHEAD\u5206\u652f\u7684\u4e00\u4fa7\u5c06\u4f1a\u53cd\u8f6c"},"content":{"rendered":"<h1>\u9996\u5148<\/h1>\n<p>\u8fd9\u662f\u5173\u4e8eGit\u7684merge\u548crebase\u57fa\u672c\u7684\u8ba8\u8bba\u3002<\/p>\n<h1>\u6837\u672cGit\u6811\u548c\u4ee3\u7801<\/h1>\n<p>Git \u6811\u7684\u524d\u63d0\u6761\u4ef6<\/p>\n<pre class=\"post-pre\"><code>* &lt;176d8be&gt; (master) hello master\r\n| * &lt;f7edd2a&gt; (HEAD -&gt; feature) print feature\r\n|\/  \r\n* &lt;5e9878f&gt; first commit\r\n<\/code><\/pre>\n<p>\u4ece\u6700\u521d\u7684\u63d0\u4ea4\u5f00\u59cb\uff0c\u4e3b\u5206\u652f\u548c\u7279\u6027\u5206\u652f\u5206\u53c9\u4e86\u3002<\/p>\n<pre class=\"post-pre\"><code>def main():\r\n    # main prints Hello feature\r\n    print(\"Hello feature\")\r\n\r\nif __name__ == \"__main__\":\r\n    main()\r\n<\/code><\/pre>\n<pre class=\"post-pre\"><code>def main():\r\n    # main prints Hello master\r\n    print(\"Hello master\")\r\n\r\nif __name__ == \"__main__\":\r\n    main()\r\n<\/code><\/pre>\n<h1>\u51b2\u7a81\u53d1\u751f<\/h1>\n<p>\u4ee5HEAD\u4f5c\u4e3afeature\u5206\u652f\uff0c\u5408\u5e76master\u5206\u652f\uff0c\u67e5\u770bmaster\u5206\u652f\u7684\u51b2\u7a81\u72b6\u6001\uff1b\u4ee5HEAD\u4f5c\u4e3afeature\u5206\u652f\uff0c\u5c06master\u5206\u652f\u53d8\u57fa\uff0c\u67e5\u770b\u51b2\u7a81\u72b6\u6001\u3002<\/p>\n<h2>\u5408\u5e76git<\/h2>\n<p>\u4f7f\u7528git merge master\u65f6\uff0c\u4e3b\u5206\u652f\u6210\u4e3a\u6311\u6218\u8005\u3002<\/p>\n<pre class=\"post-pre\"><code>$ git checkout feature\r\n$ git merge master\r\n<\/code><\/pre>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d304437434c4406c5b3f0\/13-0.png\" alt=\"\u30b9\u30af\u30ea\u30fc\u30f3\u30b7\u30e7\u30c3\u30c8 2018-01-15 22.16.07.png\" \/><\/div>\n<p>\u76ee\u524d\u7684\u66f4\u6539\u4e00\u76f4\u662f\u7279\u6027\u3002<\/p>\n<p>\u5408\u5e76\u51b2\u7a81\u89e3\u51b3\u540e\u7684Git\u6811<\/p>\n<pre class=\"post-pre\"><code>*   &lt;07ad829&gt;  (HEAD -&gt; feature) merge master into feature\r\n|\\  \r\n| * &lt;176d8be&gt;  (master) hello master\r\n* | &lt;f7edd2a&gt;  print feature\r\n|\/  \r\n* &lt;5e9878f&gt;  first commit\r\n<\/code><\/pre>\n<p>\u5728\u5408\u5e76\u8fc7\u7a0b\u4e2d\uff0c\u73b0\u6709\u7684\u63d0\u4ea4\u4e0d\u4f1a\u6d88\u5931\uff08\u4e0d\u4f1a\u88ab\u7834\u574f\uff09\u3002<\/p>\n<h2>\u91cd\u65b0\u57fa\u4e8egit<\/h2>\n<p>\u53ea\u8981\u53d6\u4e00\u4e2a\u9009\u9879\uff0c\u8bf7\u5c06\u4ee5\u4e0b\u5185\u5bb9\u4ee5\u4e2d\u56fd\u6bcd\u8bed\u8fdb\u884c\u6539\u5199\uff1a<\/p>\n<p>\u5982\u679c\u4f7f\u7528git rebase master\uff0c\u5219feature\u5c06\u6210\u4e3a\u6311\u6218\u8005\u3002<\/p>\n<pre class=\"post-pre\"><code>$ git checkout feature\r\n$ git rebase master\r\n<\/code><\/pre>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d304437434c4406c5b3f0\/21-0.png\" alt=\"\u30b9\u30af\u30ea\u30fc\u30f3\u30b7\u30e7\u30c3\u30c8 2018-01-15 22.15.35.png\" \/><\/div>\n<p>\u5728rebase\u8fc7\u7a0b\u4e2d\uff0cmaster\u5c06\u6210\u4e3aHEAD\uff0c\u5c31\u50cf\u5c4f\u5e55\u622a\u56fe\u4e2d\u7684\u60c5\u51b5\u4e00\u6837\u3002<\/p>\n<p>\u89e3\u51b3rebase\u51b2\u7a81\u4e4b\u540e\u7684Git\u6811<\/p>\n<pre class=\"post-pre\"><code>* &lt;37f6e7e&gt;  (HEAD -&gt; feature) print feature\r\n* &lt;176d8be&gt;  (master) hello master\r\n* &lt;5e9878f&gt;  first commit\r\n<\/code><\/pre>\n<p>\u5728rebase\u4e2d\uff0c\u6211\u4eec\u521b\u5efa\u4e86\u4e00\u4e2a\u65b0\u7684\u63d0\u4ea4\uff0c\u65e7\u7684\u63d0\u4ea4\uff08f7edd2a\uff09\u5c06\u6d88\u5931\uff0c\u5e76\u76f4\u63a5\u653e\u5165master\u5206\u652f\u3002<\/p>\n<p>\u5f53rebase\u5b8c\u6210\u540e\uff0cHEAD\u5c06\u56de\u5230feature\u5206\u652f\u3002<\/p>\n<h1>\u6700\u540e<\/h1>\n<ul class=\"post-ul\">\n<li style=\"list-style-type: none;\">\n<ul class=\"post-ul\">\u3061\u306a\u307f\u306b\u82f1\u8a9e\u3067\u306f\u73fe\u5728\u306e\u5909\u66f4(HEAD)\u306f ours \u3001\u5165\u529b\u5074\u306e\u5909\u66f4(\u30c1\u30e3\u30ec\u30f3\u30b8\u30e3\u30fc)\u306f theirs \u3068\u3044\u3046<\/ul>\n<\/li>\n<\/ul>\n<p>&nbsp;<\/p>\n<ul class=\"post-ul\">\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u89e3\u6d88\u306f\u672c\u8a18\u4e8b\u306e\u30b9\u30af\u30b7\u30e7\u7528\u306b\u3082\u4f7f\u3063\u305fVisual Studio Code\u304c\u4fbf\u5229<\/ul>\n","protected":false},"excerpt":{"rendered":"<p>\u9996\u5148 \u8fd9\u662f\u5173\u4e8eGit\u7684merge\u548crebase\u57fa\u672c\u7684\u8ba8\u8bba\u3002 \u6837\u672cGit\u6811\u548c\u4ee3\u7801 Git \u6811\u7684\u524d\u63d0\u6761\u4ef6 * &#038;l [&hellip;]<\/p>\n","protected":false},"author":11,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-37759","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>\u3010Git\u57fa\u7840\u3011\u5728git merge\u548cgit rebase\u4e2d\uff0c\u5f53\u51fa\u73b0\u51b2\u7a81\u65f6\uff0cHEAD\u5206\u652f\u7684\u4e00\u4fa7\u5c06\u4f1a\u53cd\u8f6c - 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\/\u3010git\u57fa\u7840\u3011\u5728git-merge\u548cgit-rebase\u4e2d\uff0c\u5f53\u51fa\u73b0\u51b2\u7a81\u65f6\uff0chead\u5206\u652f\u7684\u4e00\/\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"\u3010Git\u57fa\u7840\u3011\u5728git merge\u548cgit rebase\u4e2d\uff0c\u5f53\u51fa\u73b0\u51b2\u7a81\u65f6\uff0cHEAD\u5206\u652f\u7684\u4e00\u4fa7\u5c06\u4f1a\u53cd\u8f6c\" \/>\n<meta property=\"og:description\" content=\"\u9996\u5148 \u8fd9\u662f\u5173\u4e8eGit\u7684merge\u548crebase\u57fa\u672c\u7684\u8ba8\u8bba\u3002 \u6837\u672cGit\u6811\u548c\u4ee3\u7801 Git \u6811\u7684\u524d\u63d0\u6761\u4ef6 * &amp;l [&hellip;]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.silicloud.com\/zh\/blog\/\u3010git\u57fa\u7840\u3011\u5728git-merge\u548cgit-rebase\u4e2d\uff0c\u5f53\u51fa\u73b0\u51b2\u7a81\u65f6\uff0chead\u5206\u652f\u7684\u4e00\/\" \/>\n<meta property=\"og:site_name\" content=\"Blog - Silicon Cloud\" \/>\n<meta property=\"article:published_time\" content=\"2023-02-10T21:02:55+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2024-04-30T06:00:05+00:00\" \/>\n<meta property=\"og:image\" content=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d304437434c4406c5b3f0\/13-0.png\" \/>\n<meta name=\"author\" content=\"\u65b0, \u97f5\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:label1\" content=\"\u4f5c\u8005\" \/>\n\t<meta name=\"twitter:data1\" content=\"\u65b0, \u97f5\" \/>\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\/%e3%80%90git%e5%9f%ba%e7%a1%80%e3%80%91%e5%9c%a8git-merge%e5%92%8cgit-rebase%e4%b8%ad%ef%bc%8c%e5%bd%93%e5%87%ba%e7%8e%b0%e5%86%b2%e7%aa%81%e6%97%b6%ef%bc%8chead%e5%88%86%e6%94%af%e7%9a%84%e4%b8%80\/\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e5%9f%ba%e7%a1%80%e3%80%91%e5%9c%a8git-merge%e5%92%8cgit-rebase%e4%b8%ad%ef%bc%8c%e5%bd%93%e5%87%ba%e7%8e%b0%e5%86%b2%e7%aa%81%e6%97%b6%ef%bc%8chead%e5%88%86%e6%94%af%e7%9a%84%e4%b8%80\/\",\"name\":\"\u3010Git\u57fa\u7840\u3011\u5728git merge\u548cgit rebase\u4e2d\uff0c\u5f53\u51fa\u73b0\u51b2\u7a81\u65f6\uff0cHEAD\u5206\u652f\u7684\u4e00\u4fa7\u5c06\u4f1a\u53cd\u8f6c - Blog - Silicon Cloud\",\"isPartOf\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\"},\"datePublished\":\"2023-02-10T21:02:55+00:00\",\"dateModified\":\"2024-04-30T06:00:05+00:00\",\"author\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/4ba4019495123db3038fd0809e6959c9\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e5%9f%ba%e7%a1%80%e3%80%91%e5%9c%a8git-merge%e5%92%8cgit-rebase%e4%b8%ad%ef%bc%8c%e5%bd%93%e5%87%ba%e7%8e%b0%e5%86%b2%e7%aa%81%e6%97%b6%ef%bc%8chead%e5%88%86%e6%94%af%e7%9a%84%e4%b8%80\/#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e5%9f%ba%e7%a1%80%e3%80%91%e5%9c%a8git-merge%e5%92%8cgit-rebase%e4%b8%ad%ef%bc%8c%e5%bd%93%e5%87%ba%e7%8e%b0%e5%86%b2%e7%aa%81%e6%97%b6%ef%bc%8chead%e5%88%86%e6%94%af%e7%9a%84%e4%b8%80\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e5%9f%ba%e7%a1%80%e3%80%91%e5%9c%a8git-merge%e5%92%8cgit-rebase%e4%b8%ad%ef%bc%8c%e5%bd%93%e5%87%ba%e7%8e%b0%e5%86%b2%e7%aa%81%e6%97%b6%ef%bc%8chead%e5%88%86%e6%94%af%e7%9a%84%e4%b8%80\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.silicloud.com\/zh\/blog\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"\u3010Git\u57fa\u7840\u3011\u5728git merge\u548cgit rebase\u4e2d\uff0c\u5f53\u51fa\u73b0\u51b2\u7a81\u65f6\uff0cHEAD\u5206\u652f\u7684\u4e00\u4fa7\u5c06\u4f1a\u53cd\u8f6c\"}]},{\"@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\/4ba4019495123db3038fd0809e6959c9\",\"name\":\"\u65b0, \u97f5\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/secure.gravatar.com\/avatar\/d484b6c6e4ae82e8a9efea989e1d2af46d9b6ef128101e63b18f559fca0ae627?s=96&d=mm&r=g\",\"contentUrl\":\"https:\/\/secure.gravatar.com\/avatar\/d484b6c6e4ae82e8a9efea989e1d2af46d9b6ef128101e63b18f559fca0ae627?s=96&d=mm&r=g\",\"caption\":\"\u65b0, \u97f5\"},\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/author\/yunxin\/\"},{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e5%9f%ba%e7%a1%80%e3%80%91%e5%9c%a8git-merge%e5%92%8cgit-rebase%e4%b8%ad%ef%bc%8c%e5%bd%93%e5%87%ba%e7%8e%b0%e5%86%b2%e7%aa%81%e6%97%b6%ef%bc%8chead%e5%88%86%e6%94%af%e7%9a%84%e4%b8%80\/#local-main-organization-logo\",\"url\":\"\",\"contentUrl\":\"\",\"caption\":\"Blog - Silicon Cloud\"}]}<\/script>\n<!-- \/ Yoast SEO Premium plugin. -->","yoast_head_json":{"title":"\u3010Git\u57fa\u7840\u3011\u5728git merge\u548cgit rebase\u4e2d\uff0c\u5f53\u51fa\u73b0\u51b2\u7a81\u65f6\uff0cHEAD\u5206\u652f\u7684\u4e00\u4fa7\u5c06\u4f1a\u53cd\u8f6c - 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\/\u3010git\u57fa\u7840\u3011\u5728git-merge\u548cgit-rebase\u4e2d\uff0c\u5f53\u51fa\u73b0\u51b2\u7a81\u65f6\uff0chead\u5206\u652f\u7684\u4e00\/","og_locale":"zh_CN","og_type":"article","og_title":"\u3010Git\u57fa\u7840\u3011\u5728git merge\u548cgit rebase\u4e2d\uff0c\u5f53\u51fa\u73b0\u51b2\u7a81\u65f6\uff0cHEAD\u5206\u652f\u7684\u4e00\u4fa7\u5c06\u4f1a\u53cd\u8f6c","og_description":"\u9996\u5148 \u8fd9\u662f\u5173\u4e8eGit\u7684merge\u548crebase\u57fa\u672c\u7684\u8ba8\u8bba\u3002 \u6837\u672cGit\u6811\u548c\u4ee3\u7801 Git \u6811\u7684\u524d\u63d0\u6761\u4ef6 * &l [&hellip;]","og_url":"https:\/\/www.silicloud.com\/zh\/blog\/\u3010git\u57fa\u7840\u3011\u5728git-merge\u548cgit-rebase\u4e2d\uff0c\u5f53\u51fa\u73b0\u51b2\u7a81\u65f6\uff0chead\u5206\u652f\u7684\u4e00\/","og_site_name":"Blog - Silicon Cloud","article_published_time":"2023-02-10T21:02:55+00:00","article_modified_time":"2024-04-30T06:00:05+00:00","og_image":[{"url":"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d304437434c4406c5b3f0\/13-0.png"}],"author":"\u65b0, \u97f5","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"\u65b0, \u97f5","\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4":"1 \u5206"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"WebPage","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e5%9f%ba%e7%a1%80%e3%80%91%e5%9c%a8git-merge%e5%92%8cgit-rebase%e4%b8%ad%ef%bc%8c%e5%bd%93%e5%87%ba%e7%8e%b0%e5%86%b2%e7%aa%81%e6%97%b6%ef%bc%8chead%e5%88%86%e6%94%af%e7%9a%84%e4%b8%80\/","url":"https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e5%9f%ba%e7%a1%80%e3%80%91%e5%9c%a8git-merge%e5%92%8cgit-rebase%e4%b8%ad%ef%bc%8c%e5%bd%93%e5%87%ba%e7%8e%b0%e5%86%b2%e7%aa%81%e6%97%b6%ef%bc%8chead%e5%88%86%e6%94%af%e7%9a%84%e4%b8%80\/","name":"\u3010Git\u57fa\u7840\u3011\u5728git merge\u548cgit rebase\u4e2d\uff0c\u5f53\u51fa\u73b0\u51b2\u7a81\u65f6\uff0cHEAD\u5206\u652f\u7684\u4e00\u4fa7\u5c06\u4f1a\u53cd\u8f6c - Blog - Silicon Cloud","isPartOf":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website"},"datePublished":"2023-02-10T21:02:55+00:00","dateModified":"2024-04-30T06:00:05+00:00","author":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/4ba4019495123db3038fd0809e6959c9"},"breadcrumb":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e5%9f%ba%e7%a1%80%e3%80%91%e5%9c%a8git-merge%e5%92%8cgit-rebase%e4%b8%ad%ef%bc%8c%e5%bd%93%e5%87%ba%e7%8e%b0%e5%86%b2%e7%aa%81%e6%97%b6%ef%bc%8chead%e5%88%86%e6%94%af%e7%9a%84%e4%b8%80\/#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e5%9f%ba%e7%a1%80%e3%80%91%e5%9c%a8git-merge%e5%92%8cgit-rebase%e4%b8%ad%ef%bc%8c%e5%bd%93%e5%87%ba%e7%8e%b0%e5%86%b2%e7%aa%81%e6%97%b6%ef%bc%8chead%e5%88%86%e6%94%af%e7%9a%84%e4%b8%80\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e5%9f%ba%e7%a1%80%e3%80%91%e5%9c%a8git-merge%e5%92%8cgit-rebase%e4%b8%ad%ef%bc%8c%e5%bd%93%e5%87%ba%e7%8e%b0%e5%86%b2%e7%aa%81%e6%97%b6%ef%bc%8chead%e5%88%86%e6%94%af%e7%9a%84%e4%b8%80\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.silicloud.com\/zh\/blog\/"},{"@type":"ListItem","position":2,"name":"\u3010Git\u57fa\u7840\u3011\u5728git merge\u548cgit rebase\u4e2d\uff0c\u5f53\u51fa\u73b0\u51b2\u7a81\u65f6\uff0cHEAD\u5206\u652f\u7684\u4e00\u4fa7\u5c06\u4f1a\u53cd\u8f6c"}]},{"@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\/4ba4019495123db3038fd0809e6959c9","name":"\u65b0, \u97f5","image":{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/","url":"https:\/\/secure.gravatar.com\/avatar\/d484b6c6e4ae82e8a9efea989e1d2af46d9b6ef128101e63b18f559fca0ae627?s=96&d=mm&r=g","contentUrl":"https:\/\/secure.gravatar.com\/avatar\/d484b6c6e4ae82e8a9efea989e1d2af46d9b6ef128101e63b18f559fca0ae627?s=96&d=mm&r=g","caption":"\u65b0, \u97f5"},"url":"https:\/\/www.silicloud.com\/zh\/blog\/author\/yunxin\/"},{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e5%9f%ba%e7%a1%80%e3%80%91%e5%9c%a8git-merge%e5%92%8cgit-rebase%e4%b8%ad%ef%bc%8c%e5%bd%93%e5%87%ba%e7%8e%b0%e5%86%b2%e7%aa%81%e6%97%b6%ef%bc%8chead%e5%88%86%e6%94%af%e7%9a%84%e4%b8%80\/#local-main-organization-logo","url":"","contentUrl":"","caption":"Blog - Silicon Cloud"}]}},"_links":{"self":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37759","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\/11"}],"replies":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/comments?post=37759"}],"version-history":[{"count":2,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37759\/revisions"}],"predecessor-version":[{"id":92330,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37759\/revisions\/92330"}],"wp:attachment":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/media?parent=37759"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/categories?post=37759"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/tags?post=37759"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}