{"id":37270,"date":"2023-08-01T17:54:14","date_gmt":"2023-10-04T13:33:43","guid":{"rendered":"https:\/\/www.silicloud.com\/zh\/blog\/git-%e5%a6%82%e4%bd%95%e4%bd%bf%e7%94%a8\/"},"modified":"2024-04-30T16:30:35","modified_gmt":"2024-04-30T08:30:35","slug":"git-%e5%a6%82%e4%bd%95%e4%bd%bf%e7%94%a8","status":"publish","type":"post","link":"https:\/\/www.silicloud.com\/zh\/blog\/git-%e5%a6%82%e4%bd%95%e4%bd%bf%e7%94%a8\/","title":{"rendered":"Git \u5982\u4f55\u4f7f\u7528"},"content":{"rendered":"<p>\u6211\u4e4b\u524d\u5728\u4e0a\u4e00\u5bb6\u516c\u53f8\u4f7f\u7528\u7684\u7248\u672c\u63a7\u5236\u5de5\u5177\u662fSVN\u3002\u6211\u4e00\u76f4\u4ee5\u4e3a\u7248\u672c\u63a7\u5236\u53ea\u9002\u7528\u4e8e\u90a3\u4e9b\u4ece\u4e8b\u670d\u52a1\u5668\u7aef\u7f16\u7a0b\u7684\u4eba\uff0c\u76f4\u5230\u6211\u5728\u57fa\u7840\u8bbe\u65bd\u65b9\u9762\u8fdb\u884cLaC\u4efb\u52a1\u65f6\u53d1\u73b0\u4e86\u50cfGit\u8fd9\u6837\u7684\u5de5\u5177\u7684\u5fc5\u8981\u6027\uff0c\u6bd4\u5982Ansible\u3002\u6240\u4ee5\u6211\u5c06\u8fd9\u70b9\u8bb0\u5f55\u4e0b\u6765\u4f5c\u4e3a\u5907\u5fd8\u3002<\/p>\n<h2>\u547d\u4ee4<\/h2>\n<h3>\u5206\u5e97<\/h3>\n<pre class=\"post-pre\"><code>$ git brach \u2190 \u5b58\u5728\u3059\u308b\u30d6\u30e9\u30f3\u30c1\u3092\u4e00\u6642\u8868\u793a\u3059\u308b\r\n\r\n$ git brach\u3000\u30d6\u30e9\u30f3\u30c1\u540d \u2190 \u73fe\u5728\u306e\u30d6\u30e9\u30f3\u30c1\u3092\u5143\u306b\u65b0\u898f\u30d6\u30e9\u30f3\u30c1\u3092\u4f5c\u6210\u3059\u308b\r\n\r\n$ git checkout \u2190 \u6307\u5b9a\u3057\u305f\u30d6\u30e9\u30f3\u30c1\u306b\u79fb\u52d5\u3059\u308b\r\n\r\n## \u4e0a\u8a18\u306e\uff12\u3064\u306e\u30b3\u30de\u30f3\u30c9\u3092\u30aa\u30d7\u30b7\u30e7\u30f3\u300c-b\u300d\u3067\uff11\u767a\r\n$ git brach -b \u30d6\u30e9\u30f3\u30c1\u540d\u2190 \u65b0\u898f\u30d6\u30e9\u30f3\u30c1\u3092\u4f5c\u6210\u3057\u3001\u305d\u306e\u30d6\u30e9\u30f3\u30c1\u306b\u79fb\u52d5\u3059\u308b\r\n\r\n$ git add yuzo.html \u2190 yuzo.html\u3092\u30b9\u30c6\u30fc\u30b8\u3059\u308b\r\n\r\n## -m\u30aa\u30d7\u30b7\u30e7\u30f3\u3067\u30b3\u30df\u30c3\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8\r\n$ git commit -m \"\u30d0\u30b0\u6539\u4fee\" \u2190 \u30b3\u30df\u30c3\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u6dfb\u3048\u3066\u30b3\u30df\u30c3\u30c8\u3059\u308b\r\n\r\n$ git checkout master \u2190 master\u30d6\u30e9\u30f3\u30c1\u306b\u79fb\u52d5\u3059\u308b\r\n\r\n\r\n## \u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u3064\u3051\u3066\u3088\u308a\u77ed\u3044\u30b3\u30de\u30f3\u30c9\r\n\r\n\r\n<\/code><\/pre>\n<h3>\u5408\u5e76<\/h3>\n<p>\u5408\u5e76\u2013 \u5c06\u5728\u65b0\u5efa\u7684\u5206\u652f\u4e0a\u8fdb\u884c\u7684\u7f16\u8f91\u5185\u5bb9\u5408\u5e76\u5230\u539f\u59cb\u5206\u652f\uff08\u4e3b\u5206\u652f\uff09\u4e2d\uff08\u5373\u5206\u652f\u5408\u5e76\uff09\u3002<\/p>\n<p>\u5408\u5e76\u7684\u6b65\u9aa4\uff08\u5c06\u5206\u652fB\u5408\u5e76\u5230\u5206\u652fA\uff09<\/p>\n<p>1. \u79fb\u52a8\uff08\u68c0\u51fa\uff09\u5230\u5206\u652fA<br \/>\n2. \u9009\u62e9\u5206\u652fB\u5e76\u5408\u5e76<\/p>\n<pre class=\"post-pre\"><code>$ git checkout \u30d6\u30e9\u30f3\u30c1A \u2190\u3000\u307e\u305a\u306f\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u3092\u4f5c\u308a\u305f\u3044\u30d6\u30e9\u30f3\u30c1A\u306b\u79fb\u52d5\u3059\u308b\r\n\r\n$ git merge \u30d6\u30e9\u30f3\u30c1B\u3000\u3000\u2190\u3000\u30de\u30fc\u30b8\u3057\u305f\u3044\u30d6\u30e9\u30f3\u30c1B\u3092\u6307\u5b9a\u3057\u3066\u30de\u30fc\u30b8\u3059\u308b\r\n\r\n<\/code><\/pre>\n<h3>\u63a8\u52a8<\/h3>\n<p>\u5c06\u672c\u5730\u5b58\u50a8\u5e93\u4e2d\u53d1\u751f\u7684\u66f4\u6539\u63a8\u9001\u5230\u8fdc\u7a0b\u5b58\u50a8\u5e93\uff08\u7c7b\u4f3c\u4e8e\u5c06\u66f4\u6539\u4e0a\u4f20\u5230GitHub\uff09\u3002<\/p>\n<p>\u5c06\u8981\u63a8\u9001\u7684\u5206\u652f\u5207\u6362\u5230\u5e76\u8fdb\u884c\u63a8\u9001\u3002<\/p>\n<pre class=\"post-pre\"><code>$ git push \u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u540d\u3000\u30d6\u30e9\u30f3\u30c1\u540d\u3000\u2190 \u30ed\u30fc\u30ab\u30eb\u30ea\u30dd\u30b8\u30c8\u30ea\u3067\u884c\u3063\u305f\u5909\u66f4\u3092\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u30d7\u30c3\u30b7\u30e5\u3059\u308b\r\n\r\n## \u4eca\u56de\u306e\u81ea\u5206\u306e\u30b1\u30fc\u30b9\u3067\u306f\r\n$ git push origin master   \u2190\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u540d\u304c\u306a\u305corigin\u3068\u3044\u3046\u540d\u524d\u306a\u306e\u304b\u306e\u4ef6\u306f\u3001\u5f8c\u8ff0\r\n<\/code><\/pre>\n<h2>\u62c9<\/h2>\n","protected":false},"excerpt":{"rendered":"<p>\u6211\u4e4b\u524d\u5728\u4e0a\u4e00\u5bb6\u516c\u53f8\u4f7f\u7528\u7684\u7248\u672c\u63a7\u5236\u5de5\u5177\u662fSVN\u3002\u6211\u4e00\u76f4\u4ee5\u4e3a\u7248\u672c\u63a7\u5236\u53ea\u9002\u7528\u4e8e\u90a3\u4e9b\u4ece\u4e8b\u670d\u52a1\u5668\u7aef\u7f16\u7a0b\u7684\u4eba\uff0c\u76f4\u5230\u6211\u5728\u57fa\u7840 [&hellip;]<\/p>\n","protected":false},"author":12,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-37270","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 \u5982\u4f55\u4f7f\u7528 - 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-\u5982\u4f55\u4f7f\u7528\/\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"Git \u5982\u4f55\u4f7f\u7528\" \/>\n<meta property=\"og:description\" content=\"\u6211\u4e4b\u524d\u5728\u4e0a\u4e00\u5bb6\u516c\u53f8\u4f7f\u7528\u7684\u7248\u672c\u63a7\u5236\u5de5\u5177\u662fSVN\u3002\u6211\u4e00\u76f4\u4ee5\u4e3a\u7248\u672c\u63a7\u5236\u53ea\u9002\u7528\u4e8e\u90a3\u4e9b\u4ece\u4e8b\u670d\u52a1\u5668\u7aef\u7f16\u7a0b\u7684\u4eba\uff0c\u76f4\u5230\u6211\u5728\u57fa\u7840 [&hellip;]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.silicloud.com\/zh\/blog\/git-\u5982\u4f55\u4f7f\u7528\/\" \/>\n<meta property=\"og:site_name\" content=\"Blog - Silicon Cloud\" \/>\n<meta property=\"article:published_time\" content=\"2023-10-04T13:33:43+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2024-04-30T08:30:35+00:00\" \/>\n<meta name=\"author\" content=\"\u9038, \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=\"\u9038, \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\/git-%e5%a6%82%e4%bd%95%e4%bd%bf%e7%94%a8\/\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/git-%e5%a6%82%e4%bd%95%e4%bd%bf%e7%94%a8\/\",\"name\":\"Git \u5982\u4f55\u4f7f\u7528 - Blog - Silicon Cloud\",\"isPartOf\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\"},\"datePublished\":\"2023-10-04T13:33:43+00:00\",\"dateModified\":\"2024-04-30T08:30:35+00:00\",\"author\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/85c1dae56e6ea1e695c73d33c684d487\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git-%e5%a6%82%e4%bd%95%e4%bd%bf%e7%94%a8\/#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.silicloud.com\/zh\/blog\/git-%e5%a6%82%e4%bd%95%e4%bd%bf%e7%94%a8\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git-%e5%a6%82%e4%bd%95%e4%bd%bf%e7%94%a8\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.silicloud.com\/zh\/blog\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"Git \u5982\u4f55\u4f7f\u7528\"}]},{\"@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\/85c1dae56e6ea1e695c73d33c684d487\",\"name\":\"\u9038, \u79d1\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/secure.gravatar.com\/avatar\/c94f6d9cbbfbca863fab309840bd690c153c95f8490c290ad2ed54dd693dad16?s=96&d=mm&r=g\",\"contentUrl\":\"https:\/\/secure.gravatar.com\/avatar\/c94f6d9cbbfbca863fab309840bd690c153c95f8490c290ad2ed54dd693dad16?s=96&d=mm&r=g\",\"caption\":\"\u9038, \u79d1\"},\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/author\/keyi\/\"},{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git-%e5%a6%82%e4%bd%95%e4%bd%bf%e7%94%a8\/#local-main-organization-logo\",\"url\":\"\",\"contentUrl\":\"\",\"caption\":\"Blog - Silicon Cloud\"}]}<\/script>\n<!-- \/ Yoast SEO Premium plugin. -->","yoast_head_json":{"title":"Git \u5982\u4f55\u4f7f\u7528 - 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-\u5982\u4f55\u4f7f\u7528\/","og_locale":"zh_CN","og_type":"article","og_title":"Git \u5982\u4f55\u4f7f\u7528","og_description":"\u6211\u4e4b\u524d\u5728\u4e0a\u4e00\u5bb6\u516c\u53f8\u4f7f\u7528\u7684\u7248\u672c\u63a7\u5236\u5de5\u5177\u662fSVN\u3002\u6211\u4e00\u76f4\u4ee5\u4e3a\u7248\u672c\u63a7\u5236\u53ea\u9002\u7528\u4e8e\u90a3\u4e9b\u4ece\u4e8b\u670d\u52a1\u5668\u7aef\u7f16\u7a0b\u7684\u4eba\uff0c\u76f4\u5230\u6211\u5728\u57fa\u7840 [&hellip;]","og_url":"https:\/\/www.silicloud.com\/zh\/blog\/git-\u5982\u4f55\u4f7f\u7528\/","og_site_name":"Blog - Silicon Cloud","article_published_time":"2023-10-04T13:33:43+00:00","article_modified_time":"2024-04-30T08:30:35+00:00","author":"\u9038, \u79d1","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"\u9038, \u79d1"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"WebPage","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git-%e5%a6%82%e4%bd%95%e4%bd%bf%e7%94%a8\/","url":"https:\/\/www.silicloud.com\/zh\/blog\/git-%e5%a6%82%e4%bd%95%e4%bd%bf%e7%94%a8\/","name":"Git \u5982\u4f55\u4f7f\u7528 - Blog - Silicon Cloud","isPartOf":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website"},"datePublished":"2023-10-04T13:33:43+00:00","dateModified":"2024-04-30T08:30:35+00:00","author":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/85c1dae56e6ea1e695c73d33c684d487"},"breadcrumb":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/git-%e5%a6%82%e4%bd%95%e4%bd%bf%e7%94%a8\/#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.silicloud.com\/zh\/blog\/git-%e5%a6%82%e4%bd%95%e4%bd%bf%e7%94%a8\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git-%e5%a6%82%e4%bd%95%e4%bd%bf%e7%94%a8\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.silicloud.com\/zh\/blog\/"},{"@type":"ListItem","position":2,"name":"Git \u5982\u4f55\u4f7f\u7528"}]},{"@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\/85c1dae56e6ea1e695c73d33c684d487","name":"\u9038, \u79d1","image":{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/","url":"https:\/\/secure.gravatar.com\/avatar\/c94f6d9cbbfbca863fab309840bd690c153c95f8490c290ad2ed54dd693dad16?s=96&d=mm&r=g","contentUrl":"https:\/\/secure.gravatar.com\/avatar\/c94f6d9cbbfbca863fab309840bd690c153c95f8490c290ad2ed54dd693dad16?s=96&d=mm&r=g","caption":"\u9038, \u79d1"},"url":"https:\/\/www.silicloud.com\/zh\/blog\/author\/keyi\/"},{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git-%e5%a6%82%e4%bd%95%e4%bd%bf%e7%94%a8\/#local-main-organization-logo","url":"","contentUrl":"","caption":"Blog - Silicon Cloud"}]}},"_links":{"self":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37270","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\/12"}],"replies":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/comments?post=37270"}],"version-history":[{"count":2,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37270\/revisions"}],"predecessor-version":[{"id":93014,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37270\/revisions\/93014"}],"wp:attachment":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/media?parent=37270"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/categories?post=37270"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/tags?post=37270"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}