{"id":37583,"date":"2023-11-23T15:49:25","date_gmt":"2023-02-15T13:07:56","guid":{"rendered":"https:\/\/www.silicloud.com\/zh\/blog\/%e6%88%91%e5%b8%8c%e6%9c%9b%e6%92%a4%e9%94%80git%e6%93%8d%e4%bd%9c%e3%80%82\/"},"modified":"2024-05-04T10:27:37","modified_gmt":"2024-05-04T02:27:37","slug":"%e6%88%91%e5%b8%8c%e6%9c%9b%e6%92%a4%e9%94%80git%e6%93%8d%e4%bd%9c%e3%80%82","status":"publish","type":"post","link":"https:\/\/www.silicloud.com\/zh\/blog\/%e6%88%91%e5%b8%8c%e6%9c%9b%e6%92%a4%e9%94%80git%e6%93%8d%e4%bd%9c%e3%80%82\/","title":{"rendered":"\u6211\u5e0c\u671b\u64a4\u9500Git\u64cd\u4f5c"},"content":{"rendered":"

\u7b80\u8981\u6982\u8ff0<\/h1>\n

\u6211\u5e0c\u671b\u64a4\u9500\u5728\u9519\u8bef\u7684\u5206\u652f\u4e0a\u63a8\u9001\u7684\u5185\u5bb9\u3002<\/p>\n

\u6211\u5728\u4e3b\u5206\u652f(master)\u548c\u4e00\u4e2a\u540d\u4e3atopic1 \u7684\u5206\u652f\u4e0a\u3002
\n\u6211\u60f3\u628a\u60f3\u8981\u63a8\u9001\u5230\u540d\u4e3atopic2\u7684\u5206\u652f\u4e0a\u7684\u5185\u5bb9\u9519\u8bef\u5730\u63a8\u9001\u5230\u4e86topic1\u4e0a\u3002\u771f\u662f\u72af\u4e86\u4e2a\u9519\u8bef\u3002\u6211\u60f3\u8981\u4fee\u6b63\u5b83\u3002<\/p>\n

\u6b65\u9aa4 (b\u00f9<\/h1>\n

\u9996\u5148\uff0c\u521b\u5efa\u4e00\u4e2atopic2\u5e76\u5c1d\u8bd5\u5c06\u5185\u5bb9\u8f6c\u79fb\u5230\u90a3\u91cc\u3002<\/p>\n

$ git checkout -b topic2\r\n<\/code><\/pre>\n
\u6211\u6765\u67e5\u770b\u4e00\u4e0bgit\u7684\u65e5\u5fd7\u3002\u5f53\u7136\uff0ctopic1\u548ctopic2\u7684\u63d0\u4ea4\u90fd\u662f\u76f8\u540c\u7684\u3002\u6211\u60f3\u5c06topic1\u8fd8\u539f\u5230****00\uff0c\u800c\u4fdd\u6301topic2\u4e0d\u53d8\uff0c\u4ecd\u7136\u662f****01\u3002<\/p>\n
$ git log --oneline\r\n****01 (HEAD -> topic1, topic2)\r\n****00\r\n...\r\n<\/code><\/pre>\n
\u524d\u5f80\u4e3b\u98981\u3002<\/p>\n
$ git checkout topic1\r\nSwitched to branch 'topic1'\r\n<\/code><\/pre>\n
\u5c06\u63d0\u4ea4\u8bb0\u5f55\u64a4\u56de\u81f3****00\u3002<\/p>\n
$ git reset --hard ****00\r\n<\/code><\/pre>\n
\u67e5\u770btopic1\u5206\u652f\u7684\u65e5\u5fd7\uff0c\u53d1\u73b0\u5df2\u7ecf\u56de\u6eda\u5230****00\u3002\u597d\u7684\uff0c\u6682\u65f6\u672c\u5730\u72b6\u6001\u662f\u6b63\u5e38\u7684\u3002
\n\u4f46\u662f\u5fc5\u987b\u60f3\u529e\u6cd5\u89e3\u51b3\u5df2\u7ecf\u63a8\u9001\u7684\u4ee3\u7801\u5e93\u3002<\/p>\n
$ git log --oneline\r\n****00 (HEAD -> topic1)\r\n...\r\n<\/code><\/pre>\n
\u5f3a\u5236\u63a8\u9001\u5220\u9664\u7684\u5dee\u5f02\u3002<\/p>\n
$ git push -f origin topic1\r\n<\/code><\/pre>\n
\u6211\u6765\u68c0\u67e5\u4e00\u4e0bgit\u5b58\u50a8\u5e93\u3002\u54e6\uff0c\u5b83\u5df2\u7ecf\u56de\u6765\u4e86\u3002\u597d\uff0c\u592a\u611f\u8c22\u4e86\u3002\u6709\u4e86\u8fd9\u4e2a\uff0c\u6211\u53ef\u4ee5\u5728topic2\u4e0a\u6062\u590d\u5f00\u53d1\u4e86\u3002<\/p>\n
\u53c2\u8003\u94fe\u63a5<\/h1>\n
\u628a\u5728\u9519\u8bef\u7684\u5206\u652f\u4e0a\u8fdb\u884c\u7684\u66f4\u6539\u79fb\u52a8\u5230\u6b63\u786e\u7684\u5206\u652f\u3010git\u3011\u53d6\u6d88\u63a8\u9001<\/p>\n","protected":false},"excerpt":{"rendered":"
\u7b80\u8981\u6982\u8ff0 \u6211\u5e0c\u671b\u64a4\u9500\u5728\u9519\u8bef\u7684\u5206\u652f\u4e0a\u63a8\u9001\u7684\u5185\u5bb9\u3002 \u6211\u5728\u4e3b\u5206\u652f(master)\u548c\u4e00\u4e2a\u540d\u4e3atopic1 \u7684\u5206\u652f\u4e0a\u3002  […]<\/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-37583","post","type-post","status-publish","format-standard","hentry","category-uncategorized"],"yoast_head":"\n\u6211\u5e0c\u671b\u64a4\u9500Git\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\/\u6211\u5e0c\u671b\u64a4\u9500git\u64cd\u4f5c\u3002\/\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"\u6211\u5e0c\u671b\u64a4\u9500Git\u64cd\u4f5c\" \/>\n<meta property=\"og:description\" content=\"\u7b80\u8981\u6982\u8ff0 \u6211\u5e0c\u671b\u64a4\u9500\u5728\u9519\u8bef\u7684\u5206\u652f\u4e0a\u63a8\u9001\u7684\u5185\u5bb9\u3002 \u6211\u5728\u4e3b\u5206\u652f(master)\u548c\u4e00\u4e2a\u540d\u4e3atopic1 \u7684\u5206\u652f\u4e0a\u3002 […]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.silicloud.com\/zh\/blog\/\u6211\u5e0c\u671b\u64a4\u9500git\u64cd\u4f5c\u3002\/\" \/>\n<meta property=\"og:site_name\" content=\"Blog - Silicon Cloud\" \/>\n<meta property=\"article:published_time\" content=\"2023-02-15T13:07:56+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2024-05-04T02:27:37+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<script type=\"application\/ld+json\" class=\"yoast-schema-graph\">{\"@context\":\"https:\/\/schema.org\",\"@graph\":[{\"@type\":\"WebPage\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e6%88%91%e5%b8%8c%e6%9c%9b%e6%92%a4%e9%94%80git%e6%93%8d%e4%bd%9c%e3%80%82\/\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e6%88%91%e5%b8%8c%e6%9c%9b%e6%92%a4%e9%94%80git%e6%93%8d%e4%bd%9c%e3%80%82\/\",\"name\":\"\u6211\u5e0c\u671b\u64a4\u9500Git\u64cd\u4f5c - Blog - Silicon Cloud\",\"isPartOf\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\"},\"datePublished\":\"2023-02-15T13:07:56+00:00\",\"dateModified\":\"2024-05-04T02:27:37+00:00\",\"author\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/8ca01ba7f7362ad4edb7da206a12f29e\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e6%88%91%e5%b8%8c%e6%9c%9b%e6%92%a4%e9%94%80git%e6%93%8d%e4%bd%9c%e3%80%82\/#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.silicloud.com\/zh\/blog\/%e6%88%91%e5%b8%8c%e6%9c%9b%e6%92%a4%e9%94%80git%e6%93%8d%e4%bd%9c%e3%80%82\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e6%88%91%e5%b8%8c%e6%9c%9b%e6%92%a4%e9%94%80git%e6%93%8d%e4%bd%9c%e3%80%82\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.silicloud.com\/zh\/blog\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"\u6211\u5e0c\u671b\u64a4\u9500Git\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\/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\/%e6%88%91%e5%b8%8c%e6%9c%9b%e6%92%a4%e9%94%80git%e6%93%8d%e4%bd%9c%e3%80%82\/#local-main-organization-logo\",\"url\":\"\",\"contentUrl\":\"\",\"caption\":\"Blog - Silicon Cloud\"}]}<\/script>\n<!-- \/ Yoast SEO Premium plugin. -->","yoast_head_json":{"title":"\u6211\u5e0c\u671b\u64a4\u9500Git\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\/\u6211\u5e0c\u671b\u64a4\u9500git\u64cd\u4f5c\u3002\/","og_locale":"zh_CN","og_type":"article","og_title":"\u6211\u5e0c\u671b\u64a4\u9500Git\u64cd\u4f5c","og_description":"\u7b80\u8981\u6982\u8ff0 \u6211\u5e0c\u671b\u64a4\u9500\u5728\u9519\u8bef\u7684\u5206\u652f\u4e0a\u63a8\u9001\u7684\u5185\u5bb9\u3002 \u6211\u5728\u4e3b\u5206\u652f(master)\u548c\u4e00\u4e2a\u540d\u4e3atopic1 \u7684\u5206\u652f\u4e0a\u3002 […]","og_url":"https:\/\/www.silicloud.com\/zh\/blog\/\u6211\u5e0c\u671b\u64a4\u9500git\u64cd\u4f5c\u3002\/","og_site_name":"Blog - Silicon Cloud","article_published_time":"2023-02-15T13:07:56+00:00","article_modified_time":"2024-05-04T02:27:37+00:00","author":"\u79d1, \u9896","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"\u79d1, \u9896"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"WebPage","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e6%88%91%e5%b8%8c%e6%9c%9b%e6%92%a4%e9%94%80git%e6%93%8d%e4%bd%9c%e3%80%82\/","url":"https:\/\/www.silicloud.com\/zh\/blog\/%e6%88%91%e5%b8%8c%e6%9c%9b%e6%92%a4%e9%94%80git%e6%93%8d%e4%bd%9c%e3%80%82\/","name":"\u6211\u5e0c\u671b\u64a4\u9500Git\u64cd\u4f5c - Blog - Silicon Cloud","isPartOf":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website"},"datePublished":"2023-02-15T13:07:56+00:00","dateModified":"2024-05-04T02:27:37+00:00","author":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/8ca01ba7f7362ad4edb7da206a12f29e"},"breadcrumb":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e6%88%91%e5%b8%8c%e6%9c%9b%e6%92%a4%e9%94%80git%e6%93%8d%e4%bd%9c%e3%80%82\/#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.silicloud.com\/zh\/blog\/%e6%88%91%e5%b8%8c%e6%9c%9b%e6%92%a4%e9%94%80git%e6%93%8d%e4%bd%9c%e3%80%82\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e6%88%91%e5%b8%8c%e6%9c%9b%e6%92%a4%e9%94%80git%e6%93%8d%e4%bd%9c%e3%80%82\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.silicloud.com\/zh\/blog\/"},{"@type":"ListItem","position":2,"name":"\u6211\u5e0c\u671b\u64a4\u9500Git\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\/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\/%e6%88%91%e5%b8%8c%e6%9c%9b%e6%92%a4%e9%94%80git%e6%93%8d%e4%bd%9c%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\/37583","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=37583"}],"version-history":[{"count":2,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37583\/revisions"}],"predecessor-version":[{"id":97775,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37583\/revisions\/97775"}],"wp:attachment":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/media?parent=37583"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/categories?post=37583"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/tags?post=37583"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}