{"id":156829,"date":"2019-09-08T11:36:03","date_gmt":"2019-09-08T03:36:03","guid":{"rendered":"https:\/\/lrxjmw.cn\/?p=156829"},"modified":"2019-08-27T14:27:04","modified_gmt":"2019-08-27T06:27:04","slug":"git-branch-merge","status":"publish","type":"post","link":"https:\/\/lrxjmw.cn\/git-branch-merge.html","title":{"rendered":"\u6559\u4f60\u73a9\u8f6cGit-\u5206\u652f\u5408\u5e76"},"content":{"rendered":"<table>\n<tbody>\n<tr>\n<td style=\"padding: 5px 12px; width: 25px; font-size: 22px; text-align: center; background: #E8E8E8; line-height: 30px; color: #999;\">\u5bfc\u8bfb<\/td>\n<td style=\"padding: 10px 10px 12px; line-height: 20px;\"><strong>Git \u662f\u4e00\u4e2a\u5f00\u6e90\u7684\u5206\u5e03\u5f0f\u7248\u672c\u63a7\u5236\u7cfb\u7edf\uff0c\u7528\u4e8e\u654f\u6377\u9ad8\u6548\u5730\u5904\u7406\u4efb\u4f55\u6216\u5c0f\u6216\u5927\u7684\u9879\u76ee\u3002Git \u662f Linus Torvalds \u4e3a\u4e86\u5e2e\u52a9\u7ba1\u7406 Linux \u5185\u6838\u5f00\u53d1\u800c\u5f00\u53d1\u7684\u4e00\u4e2a\u5f00\u653e\u6e90\u7801\u7684\u7248\u672c\u63a7\u5236\u8f6f\u4ef6\u3002Git \u4e0e\u5e38\u7528\u7684\u7248\u672c\u63a7\u5236\u5de5\u5177 CVS, Subversion \u7b49\u4e0d\u540c\uff0c\u5b83\u91c7\u7528\u4e86\u5206\u5e03\u5f0f\u7248\u672c\u5e93\u7684\u65b9\u5f0f\uff0c\u4e0d\u5fc5\u670d\u52a1\u5668\u7aef\u8f6f\u4ef6\u652f\u6301\u3002<\/strong><\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<p><img loading=\"lazy\" decoding=\"async\" src=\"https:\/\/lrxjmw.cn\/wp-content\/uploads\/2019\/08\/git.jpg\" alt=\"\" width=\"651\" height=\"293\" class=\"alignnone size-full wp-image-156808\" srcset=\"https:\/\/lrxjmw.cn\/wp-content\/uploads\/2019\/08\/git.jpg 651w, https:\/\/lrxjmw.cn\/wp-content\/uploads\/2019\/08\/git-300x135.jpg 300w\" sizes=\"auto, (max-width: 651px) 100vw, 651px\" \/><\/p>\n<p>\u4e00\u65e6\u67d0\u5206\u652f\u6709\u4e86\u72ec\u7acb\u5185\u5bb9\uff0c\u4f60\u7ec8\u7a76\u4f1a\u5e0c\u671b\u5c06\u5b83\u5408\u5e76\u56de\u5230\u4f60\u7684\u4e3b\u5206\u652f\u3002 \u4f60\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u5c06\u4efb\u4f55\u5206\u652f\u5408\u5e76\u5230\u5f53\u524d\u5206\u652f\u4e2d\u53bb\uff1a<\/p>\n<pre>git merge\r\n$ git branch\r\n* master\r\n  newtest\r\n$ ls\r\nREADME        test.txt\r\n$ git merge newtest\r\nUpdating 3e92c19..c1501a2\r\nFast-forward\r\n runoob.php | 0\r\n test.txt   | 1 -\r\n 2 files changed, 1 deletion(-)\r\n create mode 100644 runoob.php\r\n delete mode 100644 test.txt\r\n$ ls\r\nREADME        runoob.php<\/pre>\n<p>\u4ee5\u4e0a\u5b9e\u4f8b\u4e2d\u6211\u4eec\u5c06 newtest \u5206\u652f\u5408\u5e76\u5230\u4e3b\u5206\u652f\u53bb\uff0ctest.txt \u6587\u4ef6\u88ab\u5220\u9664\u3002<\/p>\n<p>\u5408\u5e76\u5b8c\u540e\u5c31\u53ef\u4ee5\u5220\u9664\u5206\u652f:<\/p>\n<pre>$ git branch -d newtest\r\nDeleted branch newtest (was c1501a2).<\/pre>\n<p>\u5220\u9664\u540e\uff0c \u5c31\u53ea\u5269\u4e0b master \u5206\u652f\u4e86\uff1a<\/p>\n<pre>$ git branch\r\n* master<\/pre>\n","protected":false},"excerpt":{"rendered":"<p>\u4e00\u65e6\u67d0\u5206\u652f\u6709\u4e86\u72ec\u7acb\u5185\u5bb9\uff0c\u4f60\u7ec8\u7a76\u4f1a\u5e0c\u671b\u5c06\u5b83\u5408\u5e76\u56de\u5230\u4f60\u7684\u4e3b\u5206\u652f\u3002 \u4f60\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u5c06\u4efb\u4f55\u5206\u652f\u5408\u5e76\u5230\u5f53\u524d\u5206\u652f\u4e2d\u53bb\uff1a [&hellip;]<\/p>\n","protected":false},"author":1481,"featured_media":156809,"comment_status":"closed","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"_acf_changed":false,"footnotes":""},"categories":[55],"tags":[],"class_list":["post-156829","post","type-post","status-publish","format-standard","has-post-thumbnail","hentry","category-thread"],"acf":[],"_links":{"self":[{"href":"https:\/\/lrxjmw.cn\/wp-json\/wp\/v2\/posts\/156829","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/lrxjmw.cn\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/lrxjmw.cn\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/lrxjmw.cn\/wp-json\/wp\/v2\/users\/1481"}],"replies":[{"embeddable":true,"href":"https:\/\/lrxjmw.cn\/wp-json\/wp\/v2\/comments?post=156829"}],"version-history":[{"count":2,"href":"https:\/\/lrxjmw.cn\/wp-json\/wp\/v2\/posts\/156829\/revisions"}],"predecessor-version":[{"id":157276,"href":"https:\/\/lrxjmw.cn\/wp-json\/wp\/v2\/posts\/156829\/revisions\/157276"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/lrxjmw.cn\/wp-json\/wp\/v2\/media\/156809"}],"wp:attachment":[{"href":"https:\/\/lrxjmw.cn\/wp-json\/wp\/v2\/media?parent=156829"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/lrxjmw.cn\/wp-json\/wp\/v2\/categories?post=156829"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/lrxjmw.cn\/wp-json\/wp\/v2\/tags?post=156829"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}