{"id":37434,"date":"2023-02-09T00:24:51","date_gmt":"2023-02-06T10:10:36","guid":{"rendered":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit%e7%9a%84rebase%e6%93%8d%e4%bd%9c\/"},"modified":"2024-04-29T13:44:28","modified_gmt":"2024-04-29T05:44:28","slug":"%e5%85%b3%e4%ba%8egit%e7%9a%84rebase%e6%93%8d%e4%bd%9c","status":"publish","type":"post","link":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit%e7%9a%84rebase%e6%93%8d%e4%bd%9c\/","title":{"rendered":"\u5173\u4e8eGit\u7684rebase\u64cd\u4f5c"},"content":{"rendered":"

\u5173\u4e8eGit\u7684rebase
\nrebase
\n=> \u6e05\u7406\u66f4\u6539\u8bb0\u5f55\uff08\u5c06\u5206\u5f00\u7684\u63d0\u4ea4\u5408\u5e76\u4e3a\u4e00\u4e2a\uff09<\/p>\n

\u25cf \u547d\u4ee4
\ngit rebase \u5206\u652f\u540d\u79f0
\n\u4f8b)<\/p>\n

git rebase master\r\n=>\u73fe\u5728\u4f5c\u696d\u3057\u3066\u3044\u308b\u30d6\u30e9\u30f3\u30c1\u306e\u89aa\u30b3\u30df\u30c3\u30c8\u3092master\u30d6\u30e9\u30f3\u30c1\u306b\u5909\u66f4\u30fb\u4fee\u6b63\r\n<\/code><\/pre>\n
\u25cf\u91cd\u65b0\u57fa\u5e95\u7684\u6d41\u7a0b
\n1.\u91cd\u65b0\u57fa\u5e95
\n2.\u79fb\u81f3\u5df2\u91cd\u65b0\u57fa\u5e95\u7684\u7236\u5206\u652f
\n3.\u5c06\u91cd\u65b0\u57fa\u5e95\u7684\u5206\u652f\u4e0e\u7236\u5206\u652f\u8fdb\u884c\u5408\u5e76\uff08\u5feb\u8fdb\u5408\u5e76\uff09
\n\u4f8b\u5982\uff09\u5c06\u7279\u6027\u5206\u652f\u91cd\u65b0\u57fa\u5e95\u5230\u4e3b\u5206\u652f\u4e0a<\/p>\n
git switch feature\r\ngit rebase master\r\ngit switch master\r\ngit merge feature\r\n<\/code><\/pre>\n
\u25cf\u8bf7\u6ce8\u610f
\n\u4e0d\u8981\u5bf9\u5df2\u7ecf\u63a8\u9001\u5230GitHub\u7684\u63d0\u4ea4\u8fdb\u884crebase\u64cd\u4f5c\u3002
\n\u5982\u679c\u8fd9\u6837\u505a\uff0c\u672c\u5730\u6570\u636e\u548cGitHub\u6570\u636e\u4e4b\u95f4\u7684\u7236\u63d0\u4ea4\u5c06\u53d8\u5f97\u4e0d\u540c\uff0c\u5bfc\u81f4\u65e0\u6cd5\u8fdb\u884cpush\u64cd\u4f5c\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"
\u5173\u4e8eGit\u7684rebase rebase => \u6e05\u7406\u66f4\u6539\u8bb0\u5f55\uff08\u5c06\u5206\u5f00\u7684\u63d0\u4ea4\u5408\u5e76\u4e3a\u4e00\u4e2a\uff09 \u25cf \u547d\u4ee4 git  […]<\/p>\n","protected":false},"author":3,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-37434","post","type-post","status-publish","format-standard","hentry","category-uncategorized"],"yoast_head":"\n\u5173\u4e8eGit\u7684rebase\u64cd\u4f5c - 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\u7684rebase\u64cd\u4f5c\/\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"\u5173\u4e8eGit\u7684rebase\u64cd\u4f5c\" \/>\n<meta property=\"og:description\" content=\"\u5173\u4e8eGit\u7684rebase rebase => \u6e05\u7406\u66f4\u6539\u8bb0\u5f55\uff08\u5c06\u5206\u5f00\u7684\u63d0\u4ea4\u5408\u5e76\u4e3a\u4e00\u4e2a\uff09 \u25cf \u547d\u4ee4 git […]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.silicloud.com\/zh\/blog\/\u5173\u4e8egit\u7684rebase\u64cd\u4f5c\/\" \/>\n<meta property=\"og:site_name\" content=\"Blog - Silicon Cloud\" \/>\n<meta property=\"article:published_time\" content=\"2023-02-06T10:10:36+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2024-04-29T05:44:28+00:00\" \/>\n<meta name=\"author\" content=\"\u97f5, \u79d1\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:label1\" content=\"\u4f5c\u8005\" \/>\n\t<meta name=\"twitter:data1\" content=\"\u97f5, \u79d1\" \/>\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%e7%9a%84rebase%e6%93%8d%e4%bd%9c\/\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit%e7%9a%84rebase%e6%93%8d%e4%bd%9c\/\",\"name\":\"\u5173\u4e8eGit\u7684rebase\u64cd\u4f5c - Blog - Silicon Cloud\",\"isPartOf\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\"},\"datePublished\":\"2023-02-06T10:10:36+00:00\",\"dateModified\":\"2024-04-29T05:44:28+00:00\",\"author\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/6530331a63adef3b3443a1fab53a0e6e\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit%e7%9a%84rebase%e6%93%8d%e4%bd%9c\/#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit%e7%9a%84rebase%e6%93%8d%e4%bd%9c\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit%e7%9a%84rebase%e6%93%8d%e4%bd%9c\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.silicloud.com\/zh\/blog\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"\u5173\u4e8eGit\u7684rebase\u64cd\u4f5c\"}]},{\"@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\/6530331a63adef3b3443a1fab53a0e6e\",\"name\":\"\u97f5, \u79d1\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/secure.gravatar.com\/avatar\/429ccb39b3fff5188bc17986222cfb0936cbadb8cc933cff04ab5ca01bd30a08?s=96&d=mm&r=g\",\"contentUrl\":\"https:\/\/secure.gravatar.com\/avatar\/429ccb39b3fff5188bc17986222cfb0936cbadb8cc933cff04ab5ca01bd30a08?s=96&d=mm&r=g\",\"caption\":\"\u97f5, \u79d1\"},\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/author\/yunke\/\"},{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit%e7%9a%84rebase%e6%93%8d%e4%bd%9c\/#local-main-organization-logo\",\"url\":\"\",\"contentUrl\":\"\",\"caption\":\"Blog - Silicon Cloud\"}]}<\/script>\n<!-- \/ Yoast SEO Premium plugin. -->","yoast_head_json":{"title":"\u5173\u4e8eGit\u7684rebase\u64cd\u4f5c - 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\u7684rebase\u64cd\u4f5c\/","og_locale":"zh_CN","og_type":"article","og_title":"\u5173\u4e8eGit\u7684rebase\u64cd\u4f5c","og_description":"\u5173\u4e8eGit\u7684rebase rebase => \u6e05\u7406\u66f4\u6539\u8bb0\u5f55\uff08\u5c06\u5206\u5f00\u7684\u63d0\u4ea4\u5408\u5e76\u4e3a\u4e00\u4e2a\uff09 \u25cf \u547d\u4ee4 git […]","og_url":"https:\/\/www.silicloud.com\/zh\/blog\/\u5173\u4e8egit\u7684rebase\u64cd\u4f5c\/","og_site_name":"Blog - Silicon Cloud","article_published_time":"2023-02-06T10:10:36+00:00","article_modified_time":"2024-04-29T05:44:28+00:00","author":"\u97f5, \u79d1","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"\u97f5, \u79d1"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"WebPage","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit%e7%9a%84rebase%e6%93%8d%e4%bd%9c\/","url":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit%e7%9a%84rebase%e6%93%8d%e4%bd%9c\/","name":"\u5173\u4e8eGit\u7684rebase\u64cd\u4f5c - Blog - Silicon Cloud","isPartOf":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website"},"datePublished":"2023-02-06T10:10:36+00:00","dateModified":"2024-04-29T05:44:28+00:00","author":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/6530331a63adef3b3443a1fab53a0e6e"},"breadcrumb":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit%e7%9a%84rebase%e6%93%8d%e4%bd%9c\/#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit%e7%9a%84rebase%e6%93%8d%e4%bd%9c\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit%e7%9a%84rebase%e6%93%8d%e4%bd%9c\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.silicloud.com\/zh\/blog\/"},{"@type":"ListItem","position":2,"name":"\u5173\u4e8eGit\u7684rebase\u64cd\u4f5c"}]},{"@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\/6530331a63adef3b3443a1fab53a0e6e","name":"\u97f5, \u79d1","image":{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/","url":"https:\/\/secure.gravatar.com\/avatar\/429ccb39b3fff5188bc17986222cfb0936cbadb8cc933cff04ab5ca01bd30a08?s=96&d=mm&r=g","contentUrl":"https:\/\/secure.gravatar.com\/avatar\/429ccb39b3fff5188bc17986222cfb0936cbadb8cc933cff04ab5ca01bd30a08?s=96&d=mm&r=g","caption":"\u97f5, \u79d1"},"url":"https:\/\/www.silicloud.com\/zh\/blog\/author\/yunke\/"},{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit%e7%9a%84rebase%e6%93%8d%e4%bd%9c\/#local-main-organization-logo","url":"","contentUrl":"","caption":"Blog - Silicon Cloud"}]}},"_links":{"self":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37434","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\/3"}],"replies":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/comments?post=37434"}],"version-history":[{"count":2,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37434\/revisions"}],"predecessor-version":[{"id":85625,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37434\/revisions\/85625"}],"wp:attachment":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/media?parent=37434"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/categories?post=37434"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/tags?post=37434"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}