{"id":37425,"date":"2023-12-09T04:44:56","date_gmt":"2023-05-29T06:17:05","guid":{"rendered":"https:\/\/www.silicloud.com\/zh\/blog\/git-rebase-%e5%92%8c-merge\/"},"modified":"2024-05-04T12:46:19","modified_gmt":"2024-05-04T04:46:19","slug":"git-rebase-%e5%92%8c-merge","status":"publish","type":"post","link":"https:\/\/www.silicloud.com\/zh\/blog\/git-rebase-%e5%92%8c-merge\/","title":{"rendered":"Git rebase \u548c merge"},"content":{"rendered":"<h1>\u9996\u5148<\/h1>\n<p>\u6211\u6574\u7406\u4e86\u4e00\u4e0b\u5173\u4e8egit rebase\u548cmerge\u7684\u5185\u5bb9\u3002<\/p>\n<h1>git rebase \u548c merge \u662f\u4ec0\u4e48\u610f\u601d\uff1f<\/h1>\n<ul class=\"post-ul\">\n<li style=\"list-style-type: none;\">\n<ul class=\"post-ul\">\u6307\u5b9a\u3057\u305f\u30d6\u30e9\u30f3\u30c1\u306e\u6700\u65b0\u30b3\u30df\u30c3\u30c8\u306b\u8ffd\u5f93\u3055\u305b\u308b<\/ul>\n<\/li>\n<\/ul>\n<p>&nbsp;<\/p>\n<ul class=\"post-ul\">feature\u30d6\u30e9\u30f3\u30c1\u3067main\u30d6\u30e9\u30f3\u30c1\u306e\u6700\u65b0\u3092\u53d6\u308a\u8fbc\u3080\u3068\u304d\u306a\u3069\u306b\u5229\u7528\u3059\u308b\u30b3\u30de\u30f3\u30c9<\/ul>\n<h1>\u53d8\u57fa<\/h1>\n<p>\u5c06\u6700\u65b0\u7684\u4e3b\u5206\u652f\u5408\u5e76\u5230feature\u5206\u652f\u4e2d\u3002<\/p>\n<p>\u91cd\u7f6e\u524d<\/p>\n<pre class=\"post-pre\"><code>A---B---C       &lt;-- main\r\n     \\\r\n      D---E     &lt;-- feature\r\n<\/code><\/pre>\n<p>\u91cd\u5b9a\u57fa\u540e j\u012b<\/p>\n<p>\u4ece\u63d0\u4ea4C\u4e3a\u8d77\u70b9\uff0c\u5c06D&#8217;\u548cE&#8217;\u5e94\u7528\u5230feature\u5206\u652f\u3002<\/p>\n<pre class=\"post-pre\"><code>A---B---C        &lt;-- main\r\n         \\\r\n          D'--E' &lt;-- feature\r\n\r\n<\/code><\/pre>\n<h1>\u5408\u5e76git<\/h1>\n<p>\u5c06\u6700\u65b0\u7684main\u5206\u652f\u5408\u5e76\u5230feature\u5206\u652f\u4e2d\u3002<\/p>\n<p>\u5408\u5e76\u4e4b\u524d<\/p>\n<pre class=\"post-pre\"><code>A---B---C       &lt;-- main\r\n     \\\r\n      D---E     &lt;-- feature\r\n<\/code><\/pre>\n<p>\u5408\u5e76\u4e4b\u540e<\/p>\n<p>\u521b\u5efa\u4e00\u4e2a\u65b0\u7684\u63d0\u4ea4M\u3002<\/p>\n<pre class=\"post-pre\"><code>A---B---C        &lt;-- main\r\n     \\    \r\n      D---E---M  &lt;-- feature\r\n<\/code><\/pre>\n<h1>rebase\u548cmerge\u7684\u533a\u522b<\/h1>\n<p>\u4ee5\u4e0b\u662f\u4e2d\u56fd\u8bed\u8a00\u7684\u540c\u4e49\u8868\u8fbe\uff1a<\/p>\n<p>1. https:\/\/www.wantedly.com\/companies\/progrit\/post_articles\/412697<br \/>\n\u8bf7\u8bbf\u95ee\u6b64\u94fe\u63a5\u4e86\u89e3\u66f4\u591a\u4fe1\u606f\uff1ahttps:\/\/www.wantedly.com\/companies\/progrit\/post_articles\/412697<\/p>\n<p>2. https:\/\/qiita.com\/miriwo\/items\/0a3a6444abbeb48f0fe7<br \/>\n\u6709\u5173\u8be6\u7ec6\u4fe1\u606f\uff0c\u8bf7\u67e5\u770b\u6b64\u94fe\u63a5\uff1ahttps:\/\/qiita.com\/miriwo\/items\/0a3a6444abbeb48f0fe7<\/p>\n<h1>\u5728\u4e2d\u56fd\uff0c\u5982\u4f55\u8fdb\u884crebase\uff1f<\/h1>\n<ol>\n<li style=\"list-style-type: none;\">\n<ol>\u5c06\u539f\u59cb\u5206\u652f\u7684HEAD\u4f5c\u4e3a\u65e0\u540d\u5206\u652f\u521b\u5efa\uff0c\u7136\u540e\u68c0\u51fa\u65e0\u540d\u5206\u652f\u3002<\/ol>\n<\/li>\n<\/ol>\n<p>&nbsp;<\/p>\n<ol>\n<li style=\"list-style-type: none;\">\n<ol>\u5c06\u65e0\u540d\u5206\u652f\u4f5c\u4e3a\u57fa\u51c6\u5206\u652f\u8fdb\u884crebase\uff0c\u5e76\u5c06rebase\u76ee\u6807\u5206\u652f\u7684\u63d0\u4ea4\u4f5c\u4e3a\u8865\u4e01\u5e94\u7528\u3002<\/ol>\n<\/li>\n<\/ol>\n<p>&nbsp;<\/p>\n<ol>\n<li style=\"list-style-type: none;\">\n<ol>\u5982\u679c\u53d1\u751f\u51b2\u7a81\u7b49\u60c5\u51b5\uff0crebase\u5c06\u88ab\u4e2d\u65ad\uff0c\u5e76\u5904\u4e8e\u65e0\u540d\u5206\u652f\u7684\u68c0\u51fa\u72b6\u6001\u3002<\/ol>\n<\/li>\n<\/ol>\n<p>&nbsp;<\/p>\n<ol>\u5f53\u6240\u6709\u63d0\u4ea4\u90fd\u6210\u529f\u5e94\u7528\u65f6\uff0c\u5207\u6362\u65e0\u540d\u5206\u652f\u4e3arebase\u76ee\u6807\u5206\u652f\u3002<\/ol>\n<h2>\u5728\u91cd\u65b0\u5b9a\u4f4d\u65f6\u7684\u51b2\u7a81<\/h2>\n<p>a. \u89e3\u51b3\u51b2\u7a81\u5e76\u63d0\u4ea4\u4fee\u8865(&#8211;\u7ee7\u7eed)<br \/>\nb. \u653e\u5f03\u89e3\u51b3\u51b2\u7a81\u5e76\u6062\u590d\u539f\u59cb\u72b6\u6001(&#8211;\u653e\u5f03)<\/p>\n<p>\u51b2\u7a81\u7684\u89e3\u51b3\u65b9\u5f0f\u4e0e\u5408\u5e76\u76f8\u540c\u3002\u8bf7\u9009\u62e9\u6b63\u786e\u7684\u72b6\u6001\u5e76\u8fdb\u884c\u5e94\u7528\u3002<\/p>\n<p>\u6307\u4ee4<\/p>\n<pre class=\"post-pre\"><code><span class=\"c\"># \u6700\u65b0\u3092\u53d6\u308a\u8fbc\u3080\u30d6\u30e9\u30f3\u30c1\u3092\u6700\u65b0\u5316<\/span>\r\ngit pull main\r\n\r\n<span class=\"c\"># \u30ea\u30d9\u30fc\u30b9\u5bfe\u8c61\u306b\u79fb\u52d5<\/span>\r\ngit checkout feature\/xxxxx\r\n\r\n<span class=\"c\"># \u30ea\u30d9\u30fc\u30b9<\/span>\r\ngit rebase main feature\/xxxxx\r\n\r\n<span class=\"c\"># \u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u306b\u306a\u3063\u305f\u5834\u5408\u3001\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u89e3\u6d88\u3057\u3067add<\/span>\r\n<span class=\"c\"># commit\u306f\u3057\u306a\u3044<\/span>\r\ngit add <span class=\"nb\">.<\/span>\r\n\r\n<span class=\"c\"># \u4fee\u6b63\u3057\u3066\u30b3\u30df\u30c3\u30c8<\/span>\r\ngit rebase <span class=\"nt\">--continuea<\/span>\r\n<span class=\"c\"># \u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u306b\u306a\u308b\u3001\u89e3\u6d88\u3092\u7e70\u308a\u8fd4\u3057\u3066\u3044\u304f<\/span>\r\n<span class=\"c\"># \u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u306b\u306a\u3089\u306a\u3051\u308c\u3070success\u306b\u306a\u308b<\/span>\r\n\r\n<span class=\"c\"># success\u306b\u306a\u3063\u305f\u3089<\/span>\r\n<span class=\"c\"># feature\/xxxx\u30d6\u30e9\u30f3\u30c1\u306e\u30b3\u30df\u30c3\u30c8\u5c65\u6b74\u3092rebase\u3059\u308b<\/span>\r\ngit rebase <span class=\"nt\">-i<\/span> HEAD~11\r\n\r\n<span class=\"c\"># \u4e2d\u65ad\u3059\u308b\u5834\u5408<\/span>\r\ngit rebase <span class=\"nt\">--abort<\/span>\r\n<\/code><\/pre>\n<p>&nbsp;<\/p>\n<h1>\u7d50\u8ad6\u662f\u4ec0\u9ebc<\/h1>\n<p>\u7531\u4e8e\u6211\u6ca1\u6709\u4eb2\u8eab\u7ecf\u5386\u8fc7\uff0c\u6240\u4ee5\u5f88\u96be\u8bf4\uff0c\u4f46\u6839\u636e\u6211\u7684\u8c03\u67e5\uff0c\u4f3c\u4e4e\u8fdb\u884crebase\u64cd\u4f5c\u4f1a\u4f7f\u7248\u672c\u5386\u53f2\u66f4\u6613\u8bfb\u3002\u4f3c\u4e4e\u4f7f\u7528rebase\u66f4\u597d\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u9996\u5148 \u6211\u6574\u7406\u4e86\u4e00\u4e0b\u5173\u4e8egit rebase\u548cmerge\u7684\u5185\u5bb9\u3002 git rebase \u548c merge \u662f\u4ec0\u4e48\u610f [&hellip;]<\/p>\n","protected":false},"author":7,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-37425","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>Git rebase \u548c merge - 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\/git-rebase-\u548c-merge\/\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"Git rebase \u548c merge\" \/>\n<meta property=\"og:description\" content=\"\u9996\u5148 \u6211\u6574\u7406\u4e86\u4e00\u4e0b\u5173\u4e8egit rebase\u548cmerge\u7684\u5185\u5bb9\u3002 git rebase \u548c merge \u662f\u4ec0\u4e48\u610f [&hellip;]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.silicloud.com\/zh\/blog\/git-rebase-\u548c-merge\/\" \/>\n<meta property=\"og:site_name\" content=\"Blog - Silicon Cloud\" \/>\n<meta property=\"article:published_time\" content=\"2023-05-29T06:17:05+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2024-05-04T04:46:19+00:00\" \/>\n<meta name=\"author\" content=\"\u79d1, \u9896\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:label1\" content=\"\u4f5c\u8005\" \/>\n\t<meta name=\"twitter:data1\" content=\"\u79d1, \u9896\" \/>\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\/git-rebase-%e5%92%8c-merge\/\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/git-rebase-%e5%92%8c-merge\/\",\"name\":\"Git rebase \u548c merge - Blog - Silicon Cloud\",\"isPartOf\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\"},\"datePublished\":\"2023-05-29T06:17:05+00:00\",\"dateModified\":\"2024-05-04T04:46:19+00:00\",\"author\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/8ca01ba7f7362ad4edb7da206a12f29e\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git-rebase-%e5%92%8c-merge\/#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.silicloud.com\/zh\/blog\/git-rebase-%e5%92%8c-merge\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git-rebase-%e5%92%8c-merge\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.silicloud.com\/zh\/blog\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"Git rebase \u548c merge\"}]},{\"@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\/8ca01ba7f7362ad4edb7da206a12f29e\",\"name\":\"\u79d1, \u9896\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/secure.gravatar.com\/avatar\/8a6fb3cc7ba2f69d2189ba532aec4633ea7ed75ac0af162ec367cb3abc0fb2af?s=96&d=mm&r=g\",\"contentUrl\":\"https:\/\/secure.gravatar.com\/avatar\/8a6fb3cc7ba2f69d2189ba532aec4633ea7ed75ac0af162ec367cb3abc0fb2af?s=96&d=mm&r=g\",\"caption\":\"\u79d1, \u9896\"},\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/author\/keying\/\"},{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git-rebase-%e5%92%8c-merge\/#local-main-organization-logo\",\"url\":\"\",\"contentUrl\":\"\",\"caption\":\"Blog - Silicon Cloud\"}]}<\/script>\n<!-- \/ Yoast SEO Premium plugin. -->","yoast_head_json":{"title":"Git rebase \u548c merge - 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\/git-rebase-\u548c-merge\/","og_locale":"zh_CN","og_type":"article","og_title":"Git rebase \u548c merge","og_description":"\u9996\u5148 \u6211\u6574\u7406\u4e86\u4e00\u4e0b\u5173\u4e8egit rebase\u548cmerge\u7684\u5185\u5bb9\u3002 git rebase \u548c merge \u662f\u4ec0\u4e48\u610f [&hellip;]","og_url":"https:\/\/www.silicloud.com\/zh\/blog\/git-rebase-\u548c-merge\/","og_site_name":"Blog - Silicon Cloud","article_published_time":"2023-05-29T06:17:05+00:00","article_modified_time":"2024-05-04T04:46:19+00:00","author":"\u79d1, \u9896","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"\u79d1, \u9896","\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4":"1 \u5206"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"WebPage","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git-rebase-%e5%92%8c-merge\/","url":"https:\/\/www.silicloud.com\/zh\/blog\/git-rebase-%e5%92%8c-merge\/","name":"Git rebase \u548c merge - Blog - Silicon Cloud","isPartOf":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website"},"datePublished":"2023-05-29T06:17:05+00:00","dateModified":"2024-05-04T04:46:19+00:00","author":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/8ca01ba7f7362ad4edb7da206a12f29e"},"breadcrumb":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/git-rebase-%e5%92%8c-merge\/#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.silicloud.com\/zh\/blog\/git-rebase-%e5%92%8c-merge\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git-rebase-%e5%92%8c-merge\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.silicloud.com\/zh\/blog\/"},{"@type":"ListItem","position":2,"name":"Git rebase \u548c merge"}]},{"@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\/8ca01ba7f7362ad4edb7da206a12f29e","name":"\u79d1, \u9896","image":{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/","url":"https:\/\/secure.gravatar.com\/avatar\/8a6fb3cc7ba2f69d2189ba532aec4633ea7ed75ac0af162ec367cb3abc0fb2af?s=96&d=mm&r=g","contentUrl":"https:\/\/secure.gravatar.com\/avatar\/8a6fb3cc7ba2f69d2189ba532aec4633ea7ed75ac0af162ec367cb3abc0fb2af?s=96&d=mm&r=g","caption":"\u79d1, \u9896"},"url":"https:\/\/www.silicloud.com\/zh\/blog\/author\/keying\/"},{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git-rebase-%e5%92%8c-merge\/#local-main-organization-logo","url":"","contentUrl":"","caption":"Blog - Silicon Cloud"}]}},"_links":{"self":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37425","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\/7"}],"replies":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/comments?post=37425"}],"version-history":[{"count":2,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37425\/revisions"}],"predecessor-version":[{"id":98402,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37425\/revisions\/98402"}],"wp:attachment":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/media?parent=37425"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/categories?post=37425"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/tags?post=37425"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}