{"id":37617,"date":"2023-05-30T09:44:13","date_gmt":"2023-01-19T00:29:37","guid":{"rendered":"https:\/\/www.silicloud.com\/zh\/blog\/git-%e5%91%bd%e4%bb%a4-git-mingling\/"},"modified":"2024-04-30T06:35:36","modified_gmt":"2024-04-29T22:35:36","slug":"git-%e5%91%bd%e4%bb%a4-git-mingling","status":"publish","type":"post","link":"https:\/\/www.silicloud.com\/zh\/blog\/git-%e5%91%bd%e4%bb%a4-git-mingling\/","title":{"rendered":"git \u547d\u4ee4 (g\u012bt m\u00ecngl\u00ecng)"},"content":{"rendered":"

\u4ecedevelop\u5206\u652f\u4e2d\u514b\u9686\u51fafeature\u5206\u652f\u7684\u521b\u5efa<\/p>\n

$<\/span> git clone -b<\/span> develop {<\/span>URL}<\/span>        # \u30af\u30ed\u30fc\u30f3\u3057\u305f\u3044\u30ea\u30dd\u30b8\u30c8\u30ea\u306eURL<\/span>\r\n$<\/span> cd<\/span> {<\/span>clonerepo}<\/span>                    # \u30af\u30ed\u30fc\u30f3\u3057\u305f\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u79fb\u52d5<\/span>\r\n$<\/span> git checkout -b<\/span> feature-XXX       # \u30ab\u30ec\u30f3\u30c8\u30d6\u30e9\u30f3\u30c1\u304b\u3089feature\u30d6\u30e9\u30f3\u30c1\u3092\u4f5c\u6210\u3057\u3066\u5207\u308a\u66ff\u3048<\/span>\r\n$<\/span> git push origin feature-XXX       # feature\u30d6\u30e9\u30f3\u30c1\u3092\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u3078push<\/span>\r\n$<\/span> git checkout develop              # develop\u30d6\u30e9\u30f3\u30c1\u306b\u5207\u308a\u66ff\u3048<\/span>\r\n$<\/span> git pull                          # develop\u30d6\u30e9\u30f3\u30c1\u3092\u6700\u65b0\u306b\u66f4\u65b0<\/span>\r\n$<\/span> git checkout feature-XXX          # feature\u30d6\u30e9\u30f3\u30c1\u306b\u5207\u308a\u66ff\u3048<\/span>\r\n$<\/span> git merge develop                 # feature\u30d6\u30e9\u30f3\u30c1\u306bdevelop\u30d6\u30e9\u30f3\u30c1\u3092\u30de\u30fc\u30b8<\/span>\r\n$<\/span> git push origin feature-XXX       # feature\u30d6\u30e9\u30f3\u30c1\u3092\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u3078push<\/span>\r\n<\/code><\/pre>\n
\u5c06\u4ee3\u7801\u5408\u5e76\u5230release\u5206\u652f<\/p>\n
$<\/span> git checkout develop                  # develop\u30d6\u30e9\u30f3\u30c1\u306b\u5207\u308a\u66ff\u3048<\/span>\r\n$<\/span> git pull                              # develop\u30d6\u30e9\u30f3\u30c1\u306e\u6700\u65b0\u5316<\/span>\r\n$<\/span> git checkout release                  # release\u30d6\u30e9\u30f3\u30c1\u306b\u5207\u308a\u66ff\u3048<\/span>\r\n$<\/span> git pull                              # release\u30d6\u30e9\u30f3\u30c1\u306e\u6700\u65b0\u5316<\/span>\r\n$<\/span> git merge --no-ff<\/span> --no-commit<\/span> develop # develop\u30d6\u30e9\u30f3\u30c1\u3092release\u30d6\u30e9\u30f3\u30c1\u306b\u30de\u30fc\u30b8<\/span>\r\n$<\/span> git commit -m<\/span> \"merge develop\"<\/span>        # release\u30d6\u30e9\u30f3\u30c1\u306e\u30b3\u30df\u30c3\u30c8<\/span>\r\n$<\/span> git push origin release               # release\u30d6\u30e9\u30f3\u30c1\u306epush<\/span>\r\n<\/code><\/pre>\n
\u4ece\u4e3b\u5206\u652f\u5408\u5e76\u5230\u521b\u5efa\u6807\u7b7e<\/p>\n
$<\/span> git checkout release                  # release\u30d6\u30e9\u30f3\u30c1\u306b\u5207\u308a\u66ff\u3048<\/span>\r\n$<\/span> git pull                              # release\u30d6\u30e9\u30f3\u30c1\u306e\u6700\u65b0\u5316<\/span>\r\n$<\/span> git checkout master                   # master\u30d6\u30e9\u30f3\u30c1\u306b\u5207\u308a\u66ff\u3048<\/span>\r\n$<\/span> git pull                              # master\u30d6\u30e9\u30f3\u30c1\u306e\u6700\u65b0\u5316<\/span>\r\n$<\/span> git merge --no-ff<\/span> --no-commit<\/span> release # release\u30d6\u30e9\u30f3\u30c1\u3092master\u30d6\u30e9\u30f3\u30c1\u306b\u30de\u30fc\u30b8<\/span>\r\n$<\/span> git commit -m<\/span> \"v1.0.0 release\"<\/span>         # master\u30d6\u30e9\u30f3\u30c1\u306e\u30b3\u30df\u30c3\u30c8<\/span>\r\n$<\/span> git push origin master                # master\u30d6\u30e9\u30f3\u30c1\u306epush<\/span>\r\n\r\n$<\/span> git tag -a<\/span> v1.0.0 -m<\/span> \"tag v1.0.0\"<\/span>     # \u30bf\u30b0\u3092\u5207\u308b<\/span>\r\n$<\/span> git push origin v1.0.0                # \u30bf\u30b0\u306epush<\/span>\r\n<\/code><\/pre>\n
\u8bf7\u53c2\u8003<\/h3>\n
\u8bf7\u786e\u8ba4\u5f53\u524d\u6b63\u5728\u8fdb\u884c\u7ed3\u5e10\u7684\u5206\u652f\u3002<\/h4>\n
$ git branch -a\r\n<\/code><\/pre>\n
  a\r\n  develop\r\n  feature\r\n* feature-kaXXX\r\n<\/span>  remotes\/origin\/HEAD -><\/span> origin\/master\r\n  remotes\/origin\/develop\r\n  remotes\/origin\/feature-goXXX\r\n  remotes\/origin\/feature-kaXXX\r\n  remotes\/origin\/master\r\n<\/span><\/code><\/pre>\n
\u6211\u60f3\u5c06\u6240\u6709\u672c\u5730\u7684\u66f4\u6539\u5168\u90e8\u4e22\u5f03\uff0c\u4f7f\u5176\u4e0e\u8fdc\u7a0b\u4fdd\u6301\u4e00\u81f4\u3002<\/h4>\n
$ git fetch origin\r\n$ git reset --hard origin\/{branch name}\r\n<\/code><\/pre>\n
\u5728\u6267\u884cpull\u547d\u4ee4\u65f6\uff0c\u51fa\u73b0\u4e86\u201c\u5f53\u524d\u5206\u652f\u6ca1\u6709\u8ddf\u8e2a\u4fe1\u606f\u201d\u7684\u63d0\u793a\u3002<\/h3>\n
\u60a8\u53ef\u4ee5\u901a\u8fc7\u4e0b\u9762\u7684\u547d\u4ee4\u6765\u6307\u5b9agit pull\u7684\u9ed8\u8ba4\u5206\u652f\u540d\u79f0\u3002<\/p>\n
git branch --set-upstream-to=origin\/\u30ea\u30e2\u30fc\u30c8\u306e\u30d6\u30e9\u30f3\u30c1\u540d \u30ed\u30fc\u30ab\u30eb\u306e\u30d6\u30e9\u30f3\u30c1\u540d\r\n<\/code><\/pre>\n","protected":false},"excerpt":{"rendered":"
\u4ecedevelop\u5206\u652f\u4e2d\u514b\u9686\u51fafeature\u5206\u652f\u7684\u521b\u5efa $ git clone -b develop {URL} […]<\/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-37617","post","type-post","status-publish","format-standard","hentry","category-uncategorized"],"yoast_head":"\ngit \u547d\u4ee4 (g\u012bt m\u00ecngl\u00ecng) - 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-\u547d\u4ee4-git-mingling\/\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"git \u547d\u4ee4 (g\u012bt m\u00ecngl\u00ecng)\" \/>\n<meta property=\"og:description\" content=\"\u4ecedevelop\u5206\u652f\u4e2d\u514b\u9686\u51fafeature\u5206\u652f\u7684\u521b\u5efa $ git clone -b develop {URL} […]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.silicloud.com\/zh\/blog\/git-\u547d\u4ee4-git-mingling\/\" \/>\n<meta property=\"og:site_name\" content=\"Blog - Silicon Cloud\" \/>\n<meta property=\"article:published_time\" content=\"2023-01-19T00:29:37+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2024-04-29T22:35:36+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\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-%e5%91%bd%e4%bb%a4-git-mingling\/\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/git-%e5%91%bd%e4%bb%a4-git-mingling\/\",\"name\":\"git \u547d\u4ee4 (g\u012bt m\u00ecngl\u00ecng) - Blog - Silicon Cloud\",\"isPartOf\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\"},\"datePublished\":\"2023-01-19T00:29:37+00:00\",\"dateModified\":\"2024-04-29T22:35:36+00:00\",\"author\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/6530331a63adef3b3443a1fab53a0e6e\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git-%e5%91%bd%e4%bb%a4-git-mingling\/#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.silicloud.com\/zh\/blog\/git-%e5%91%bd%e4%bb%a4-git-mingling\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git-%e5%91%bd%e4%bb%a4-git-mingling\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.silicloud.com\/zh\/blog\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"git \u547d\u4ee4 (g\u012bt m\u00ecngl\u00ecng)\"}]},{\"@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\/git-%e5%91%bd%e4%bb%a4-git-mingling\/#local-main-organization-logo\",\"url\":\"\",\"contentUrl\":\"\",\"caption\":\"Blog - Silicon Cloud\"}]}<\/script>\n<!-- \/ Yoast SEO Premium plugin. -->","yoast_head_json":{"title":"git \u547d\u4ee4 (g\u012bt m\u00ecngl\u00ecng) - 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-\u547d\u4ee4-git-mingling\/","og_locale":"zh_CN","og_type":"article","og_title":"git \u547d\u4ee4 (g\u012bt m\u00ecngl\u00ecng)","og_description":"\u4ecedevelop\u5206\u652f\u4e2d\u514b\u9686\u51fafeature\u5206\u652f\u7684\u521b\u5efa $ git clone -b develop {URL} […]","og_url":"https:\/\/www.silicloud.com\/zh\/blog\/git-\u547d\u4ee4-git-mingling\/","og_site_name":"Blog - Silicon Cloud","article_published_time":"2023-01-19T00:29:37+00:00","article_modified_time":"2024-04-29T22:35:36+00:00","author":"\u97f5, \u79d1","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"\u97f5, \u79d1","\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4":"1 \u5206"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"WebPage","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git-%e5%91%bd%e4%bb%a4-git-mingling\/","url":"https:\/\/www.silicloud.com\/zh\/blog\/git-%e5%91%bd%e4%bb%a4-git-mingling\/","name":"git \u547d\u4ee4 (g\u012bt m\u00ecngl\u00ecng) - Blog - Silicon Cloud","isPartOf":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website"},"datePublished":"2023-01-19T00:29:37+00:00","dateModified":"2024-04-29T22:35:36+00:00","author":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/6530331a63adef3b3443a1fab53a0e6e"},"breadcrumb":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/git-%e5%91%bd%e4%bb%a4-git-mingling\/#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.silicloud.com\/zh\/blog\/git-%e5%91%bd%e4%bb%a4-git-mingling\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git-%e5%91%bd%e4%bb%a4-git-mingling\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.silicloud.com\/zh\/blog\/"},{"@type":"ListItem","position":2,"name":"git \u547d\u4ee4 (g\u012bt m\u00ecngl\u00ecng)"}]},{"@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\/git-%e5%91%bd%e4%bb%a4-git-mingling\/#local-main-organization-logo","url":"","contentUrl":"","caption":"Blog - Silicon Cloud"}]}},"_links":{"self":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37617","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=37617"}],"version-history":[{"count":2,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37617\/revisions"}],"predecessor-version":[{"id":90292,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37617\/revisions\/90292"}],"wp:attachment":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/media?parent=37617"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/categories?post=37617"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/tags?post=37617"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}