{"id":37382,"date":"2023-06-15T06:24:42","date_gmt":"2023-03-29T09:55:41","guid":{"rendered":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%89%88%e6%9c%ac%e5%86%b2%e7%aa%81\/"},"modified":"2024-04-30T08:56:09","modified_gmt":"2024-04-30T00:56:09","slug":"git%e7%89%88%e6%9c%ac%e5%86%b2%e7%aa%81","status":"publish","type":"post","link":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%89%88%e6%9c%ac%e5%86%b2%e7%aa%81\/","title":{"rendered":"Git\u7248\u672c\u51b2\u7a81"},"content":{"rendered":"

\u95ee\u9898\u7684\u7b80\u8981\u6982\u8ff0\u3002<\/h2>\n
\"image.png\"<\/div>\n

\u89e3\u51b3\u65b9\u6848 (ji\u011b ju\u00e9 c\u00e8)<\/h2>\n
    \n
  1. \n
      \u83b7\u53d6\u6700\u65b0\u7684master\u5206\u652f<\/ol>\n<\/li>\n<\/ol>\n

      \u9996\u5148\uff0c\u66f4\u65b0\u672c\u5730\u7684master\u5206\u652f\u4ee5\u4f7f\u5176\u5904\u4e8e\u6700\u65b0\u72b6\u6001\u3002
      \ngit checkout master
      \ngit pull origin master<\/p>\n

      \u5c06master\u5206\u652f\u5408\u5e76\u6216\u53d8\u57fa\u5230\u9879\u76ee\u5206\u652f<\/p>\n

      \u5207\u6362\u5230\u9879\u76ee\u5206\u652f\uff0c\u5e76\u5c06\u6700\u65b0\u7684master\u5206\u652f\u5408\u5e76\u6216\u53d8\u57fa\u3002
      \ngit checkout [\u9879\u76ee\u5206\u652f\u540d]
      \ngit merge master<\/p>\n

      \u6216\u8005
      \ngit rebase master<\/p>\n

      \u89e3\u51b3\u51b2\u7a81<\/p>\n

      \u5982\u679c\u5728\u5408\u5e76\u6216\u53d8\u57fa\u8fc7\u7a0b\u4e2d\u51fa\u73b0\u51b2\u7a81\uff0c\u9700\u8981\u624b\u52a8\u89e3\u51b3\u3002
      \n\u6253\u5f00\u5305\u542b\u51b2\u7a81\u7684\u6587\u4ef6\uff0c\u67e5\u770bGit\u6807\u8bb0\u7684\u51b2\u7a81\u90e8\u5206\uff0c\u5e76\u8fdb\u884c\u9002\u5f53\u7684\u4fee\u6539\u3002<\/p>\n

      \u63d0\u4ea4\u66f4\u6539<\/p>\n

      \u89e3\u51b3\u51b2\u7a81\u540e\uff0c\u5c06\u66f4\u6539\u6dfb\u52a0\u5230\u6682\u5b58\u533a\u5e76\u8fdb\u884c\u63d0\u4ea4\u3002
      \ngit add .
      \ngit commit -m “\u89e3\u51b3\u51b2\u7a81”<\/p>\n

      \u5408\u5e76\u5230master\u5206\u652f<\/p>\n

      \u518d\u6b21\u5207\u6362\u5230master\u5206\u652f\uff0c\u5e76\u5408\u5e76\u9879\u76ee\u5206\u652f\u3002
      \ngit checkout master
      \ngit merge [\u9879\u76ee\u5206\u652f\u540d]<\/p>\n

      \u5c06\u66f4\u6539\u63a8\u9001\u5230\u8fdc\u7a0b<\/p>\n

      \u6700\u540e\uff0c\u5c06\u66f4\u65b0\u540e\u7684master\u5206\u652f\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\u3002
      \ngit push origin master<\/p>\n

      \u8bf7\u6ce8\u610f\u3002<\/h2>\n
        \n
      • \n
          \u30de\u30fc\u30b8\u3084\u30ea\u30d9\u30fc\u30b9\u306e\u969b\u306b\u306f\u3001\u5e38\u306b\u6700\u65b0\u306e\u72b6\u614b\u3092\u4fdd\u3064\u3053\u3068\u304c\u91cd\u8981\u3067\u3059\u3002<\/ul>\n<\/li>\n<\/ul>\n

           <\/p>\n

            \u7af6\u5408\u306e\u89e3\u6c7a\u306b\u306f\u6ce8\u610f\u3092\u6255\u3044\u3001\u5fc5\u8981\u306b\u5fdc\u3058\u3066\u30c1\u30fc\u30e0\u30e1\u30f3\u30d0\u30fc\u3084\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30ea\u30fc\u30c0\u30fc\u3068\u76f8\u8ac7\u3057\u306a\u304c\u3089\u9032\u3081\u3066\u304f\u3060\u3055\u3044\u3002<\/ul>\n","protected":false},"excerpt":{"rendered":"

            \u95ee\u9898\u7684\u7b80\u8981\u6982\u8ff0\u3002 \u89e3\u51b3\u65b9\u6848 (ji\u011b ju\u00e9 c\u00e8) \u83b7\u53d6\u6700\u65b0\u7684master\u5206\u652f \u9996\u5148\uff0c\u66f4\u65b0\u672c\u5730\u7684master […]<\/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-37382","post","type-post","status-publish","format-standard","hentry","category-uncategorized"],"yoast_head":"\nGit\u7248\u672c\u51b2\u7a81 - 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\u7248\u672c\u51b2\u7a81\/\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"Git\u7248\u672c\u51b2\u7a81\" \/>\n<meta property=\"og:description\" content=\"\u95ee\u9898\u7684\u7b80\u8981\u6982\u8ff0\u3002 \u89e3\u51b3\u65b9\u6848 (ji\u011b ju\u00e9 c\u00e8) \u83b7\u53d6\u6700\u65b0\u7684master\u5206\u652f \u9996\u5148\uff0c\u66f4\u65b0\u672c\u5730\u7684master […]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.silicloud.com\/zh\/blog\/git\u7248\u672c\u51b2\u7a81\/\" \/>\n<meta property=\"og:site_name\" content=\"Blog - Silicon Cloud\" \/>\n<meta property=\"article:published_time\" content=\"2023-03-29T09:55:41+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2024-04-30T00:56:09+00:00\" \/>\n<meta property=\"og:image\" content=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2e4f37434c4406c53e8a\/1-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<script type=\"application\/ld+json\" class=\"yoast-schema-graph\">{\"@context\":\"https:\/\/schema.org\",\"@graph\":[{\"@type\":\"WebPage\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%89%88%e6%9c%ac%e5%86%b2%e7%aa%81\/\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%89%88%e6%9c%ac%e5%86%b2%e7%aa%81\/\",\"name\":\"Git\u7248\u672c\u51b2\u7a81 - Blog - Silicon Cloud\",\"isPartOf\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\"},\"datePublished\":\"2023-03-29T09:55:41+00:00\",\"dateModified\":\"2024-04-30T00:56:09+00:00\",\"author\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/f044a4b7fa4ee2701702942002419ca6\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%89%88%e6%9c%ac%e5%86%b2%e7%aa%81\/#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%89%88%e6%9c%ac%e5%86%b2%e7%aa%81\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%89%88%e6%9c%ac%e5%86%b2%e7%aa%81\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.silicloud.com\/zh\/blog\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"Git\u7248\u672c\u51b2\u7a81\"}]},{\"@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\/git%e7%89%88%e6%9c%ac%e5%86%b2%e7%aa%81\/#local-main-organization-logo\",\"url\":\"\",\"contentUrl\":\"\",\"caption\":\"Blog - Silicon Cloud\"}]}<\/script>\n<!-- \/ Yoast SEO Premium plugin. -->","yoast_head_json":{"title":"Git\u7248\u672c\u51b2\u7a81 - 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\u7248\u672c\u51b2\u7a81\/","og_locale":"zh_CN","og_type":"article","og_title":"Git\u7248\u672c\u51b2\u7a81","og_description":"\u95ee\u9898\u7684\u7b80\u8981\u6982\u8ff0\u3002 \u89e3\u51b3\u65b9\u6848 (ji\u011b ju\u00e9 c\u00e8) \u83b7\u53d6\u6700\u65b0\u7684master\u5206\u652f \u9996\u5148\uff0c\u66f4\u65b0\u672c\u5730\u7684master […]","og_url":"https:\/\/www.silicloud.com\/zh\/blog\/git\u7248\u672c\u51b2\u7a81\/","og_site_name":"Blog - Silicon Cloud","article_published_time":"2023-03-29T09:55:41+00:00","article_modified_time":"2024-04-30T00:56:09+00:00","og_image":[{"url":"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2e4f37434c4406c53e8a\/1-0.png"}],"author":"\u96c5, \u609f","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"\u96c5, \u609f"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"WebPage","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%89%88%e6%9c%ac%e5%86%b2%e7%aa%81\/","url":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%89%88%e6%9c%ac%e5%86%b2%e7%aa%81\/","name":"Git\u7248\u672c\u51b2\u7a81 - Blog - Silicon Cloud","isPartOf":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website"},"datePublished":"2023-03-29T09:55:41+00:00","dateModified":"2024-04-30T00:56:09+00:00","author":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/f044a4b7fa4ee2701702942002419ca6"},"breadcrumb":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%89%88%e6%9c%ac%e5%86%b2%e7%aa%81\/#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.silicloud.com\/zh\/blog\/git%e7%89%88%e6%9c%ac%e5%86%b2%e7%aa%81\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%89%88%e6%9c%ac%e5%86%b2%e7%aa%81\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.silicloud.com\/zh\/blog\/"},{"@type":"ListItem","position":2,"name":"Git\u7248\u672c\u51b2\u7a81"}]},{"@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\/git%e7%89%88%e6%9c%ac%e5%86%b2%e7%aa%81\/#local-main-organization-logo","url":"","contentUrl":"","caption":"Blog - Silicon Cloud"}]}},"_links":{"self":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37382","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=37382"}],"version-history":[{"count":2,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37382\/revisions"}],"predecessor-version":[{"id":90937,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37382\/revisions\/90937"}],"wp:attachment":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/media?parent=37382"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/categories?post=37382"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/tags?post=37382"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}