{"id":209,"date":"2020-01-07T14:29:25","date_gmt":"2020-01-07T06:29:25","guid":{"rendered":"http:\/\/blog.adeying.com\/?p=209"},"modified":"2020-01-07T14:29:25","modified_gmt":"2020-01-07T06:29:25","slug":"git-%e5%9c%a8%e5%9b%a2%e9%98%9f%e4%b8%ad%e7%9a%84%e6%9c%80%e4%bd%b3%e5%ae%9e%e8%b7%b5-%e5%a6%82%e4%bd%95%e6%ad%a3%e7%a1%ae%e4%bd%bf%e7%94%a8git-flow","status":"publish","type":"post","link":"https:\/\/adeqing.com\/index.php\/2020\/01\/07\/default\/209\/","title":{"rendered":"Git \u5728\u56e2\u961f\u4e2d\u7684\u6700\u4f73\u5b9e\u8df5&#8211;\u5982\u4f55\u6b63\u786e\u4f7f\u7528Git Flow"},"content":{"rendered":"<h2><a id=\"cb_post_title_url\" class=\"postTitle2\" href=\"https:\/\/www.cnblogs.com\/cnblogsfans\/p\/5075073.html\">Git \u5728\u56e2\u961f\u4e2d\u7684\u6700\u4f73\u5b9e\u8df5&#8211;\u5982\u4f55\u6b63\u786e\u4f7f\u7528Git Flow<\/a><\/h2>\n<div class=\"entry\">\n<div id=\"cnblogs_post_body\" class=\"blogpost-body cnblogs-markdown\">\n<h2 id=\"git\u7684\u4f18\u70b9\">Git\u7684\u4f18\u70b9<\/h2>\n<p>Git\u7684\u4f18\u70b9\u5f88\u591a\uff0c\u4f46\u662f\u8fd9\u91cc\u53ea\u5217\u51fa\u6211\u8ba4\u4e3a\u975e\u5e38\u7a81\u51fa\u7684\u51e0\u70b9\u3002<\/p>\n<ol>\n<li>\u7531\u4e8e\u662f\u5206\u5e03\u5f0f\uff0c\u6240\u6709\u672c\u5730\u5e93\u5305\u542b\u4e86\u8fdc\u7a0b\u5e93\u7684\u6240\u6709\u5185\u5bb9\u3002<\/li>\n<li>\u4f18\u79c0\u7684\u5206\u652f\u6a21\u578b\uff0c\u6253\u5206\u652f\u4ee5\u53ca\u5408\u5e76\u5206\u652f\uff0c\u673a\u5668\u65b9\u4fbf\u3002<\/li>\n<li>\u5feb\u901f\uff0c\u5728\u8fd9\u4e2a\u65f6\u95f4\u5c31\u662f\u91d1\u94b1\u7684\u65f6\u4ee3\uff0cGit\u7531\u4e8e\u4ee3\u7801\u90fd\u5728\u672c\u5730\uff0c\u6253\u5206\u652f\u548c\u5408\u5e76\u5206\u652f\u673a\u5668\u5feb\u901f\uff0c\u4f7f\u7528\u4e2aSVN\u7684\u80fd\u6df1\u523b\u4f53\u4f1a\u5230\u8fd9\u79cd\u4f18\u52bf\u3002<\/li>\n<\/ol>\n<p>\u611f\u5174\u8da3\u7684\uff0c\u53ef\u4ee5\u53bb\u770b\u4e00\u4e0bGit\u672c\u8eab\u7684\u8bbe\u8ba1\uff0c\u5185\u5728\u7684\u67b6\u6784\u4f53\u73b0\u4e86\u5f88\u591a\u7684\u4f18\u52bf\uff0c\u4e0d\u6127\u662f\u51fa\u8d44\u5929\u624d\u7a0b\u5e8f\u5458Linus (Linux\u4e4b\u7236) \u4e4b\u624b<\/p>\n<h2 id=\"\u7248\u672c\u7ba1\u7406\u7684\u6311\u6218\">\u7248\u672c\u7ba1\u7406\u7684\u6311\u6218<\/h2>\n<p>\u867d\u7136\u6709\u8fd9\u4e48\u4f18\u79c0\u7684\u7248\u672c\u7ba1\u7406\u5de5\u5177\uff0c\u4f46\u662f\u6211\u4eec\u9762\u5bf9\u7248\u672c\u7ba1\u7406\u7684\u65f6\u5019\uff0c\u4f9d\u7136\u6709\u975e\u5e38\u5927\u5f97\u6311\u6218\uff0c\u6211\u4eec\u90fd\u77e5\u9053\u5927\u5bb6\u5de5\u4f5c\u5728\u540c\u4e00\u4e2a\u4ed3\u5e93\u4e0a\uff0c\u90a3\u4e48\u5f7c\u6b64\u7684\u4ee3\u7801\u534f\u4f5c\u5fc5\u7136\u5e26\u6765\u5f88\u591a\u95ee\u9898\u548c\u6311\u6218\uff0c\u5982\u4e0b\uff1a<\/p>\n<ol>\n<li>\u5982\u4f55\u5f00\u59cb\u4e00\u4e2aFeature\u7684\u5f00\u53d1\uff0c\u800c\u4e0d\u5f71\u54cd\u522b\u7684Feature\uff1f<\/li>\n<li>\u7531\u4e8e\u5f88\u5bb9\u6613\u521b\u5efa\u65b0\u5206\u652f\uff0c\u5206\u652f\u591a\u4e86\u5982\u4f55\u7ba1\u7406\uff0c\u65f6\u95f4\u4e45\u4e86\uff0c\u5982\u4f55\u77e5\u9053\u6bcf\u4e2a\u5206\u652f\u662f\u5e72\u4ec0\u4e48\u7684\uff1f<\/li>\n<li>\u54ea\u4e9b\u5206\u652f\u5df2\u7ecf\u5408\u5e76\u56de\u4e86\u4e3b\u5e72\uff1f<\/li>\n<li>\u5982\u4f55\u8fdb\u884cRelease\u7684\u7ba1\u7406\uff1f\u5f00\u59cb\u4e00\u4e2aRelease\u7684\u65f6\u5019\u5982\u4f55\u51bb\u7ed3Feature, \u5982\u4f55\u5728Prepare Release\u7684\u65f6\u5019\uff0c\u5f00\u53d1\u4eba\u5458\u53ef\u4ee5\u7ee7\u7eed\u5f00\u53d1\u65b0\u7684\u529f\u80fd\uff1f<\/li>\n<li>\u7ebf\u4e0a\u4ee3\u7801\u51faBug\u4e86\uff0c\u5982\u4f55\u5feb\u901f\u4fee\u590d\uff1f\u800c\u4e14\u4fee\u590d\u7684\u4ee3\u7801\u8981\u5305\u542b\u5230\u5f00\u53d1\u4eba\u5458\u7684\u5206\u652f\u4ee5\u53ca\u4e0b\u4e00\u4e2aRelease?<\/li>\n<\/ol>\n<p>\u5927\u90e8\u5206\u5f00\u53d1\u4eba\u5458\u73b0\u5728\u4f7f\u7528Git\u5c31\u53ea\u662f\u7528\u4e09\u4e2a\u751a\u81f3\u4e24\u4e2a\u5206\u652f\uff0c\u4e00\u4e2a\u662fMaster, \u4e00\u4e2a\u662fDevelop, \u8fd8\u6709\u4e00\u4e2a\u662f\u57fa\u4e8eDevelop\u6253\u5f97\u5404\u79cd\u5206\u652f\u3002\u8fd9\u4e2a\u5728\u5c0f\u9879\u76ee\u89c4\u6a21\u7684\u65f6\u5019\u8fd8\u52c9\u5f3a\u53ef\u4ee5\u652f\u6491\uff0c\u56e0\u4e3a\u5f88\u591a\u4eba\u505a\u9879\u76ee\u5c31\u53ea\u6709\u4e00\u4e2aRelease, \u4f46\u662f\u4eba\u5458\u4e00\u591a\uff0c\u800c\u4e14\u9879\u76ee\u5468\u671f\u4e00\u957f\u5c31\u4f1a\u51fa\u73b0\u5404\u79cd\u95ee\u9898\u3002<\/p>\n<h2 id=\"git-flow\">Git Flow<\/h2>\n<p>\u5c31\u50cf\u4ee3\u7801\u9700\u8981\u4ee3\u7801\u89c4\u8303\u4e00\u6837\uff0c\u4ee3\u7801\u7ba1\u7406\u540c\u6837\u9700\u8981\u4e00\u4e2a\u6e05\u6670\u7684\u6d41\u7a0b\u548c\u89c4\u8303<\/p>\n<p>Vincent Driessen \u540c\u5b66\u4e3a\u4e86\u89e3\u51b3\u8fd9\u4e2a\u95ee\u9898\u63d0\u51fa\u4e86\u00a0<a href=\"http:\/\/nvie.com\/posts\/a-successful-git-branching-model\/\">A Successful Git Branching Model<\/a><\/p>\n<p>\u4e0b\u9762\u662fGit Flow\u7684\u6d41\u7a0b\u56fe<\/p>\n<p><img decoding=\"async\" class=\"img-responsive\" src=\"https:\/\/images.cnblogs.com\/cnblogs_com\/cnblogsfans\/771108\/o_git-flow-nvie.png\" \/><\/p>\n<p>\u4e0a\u9762\u7684\u56fe\u4f60\u7406\u89e3\u4e0d\u4e86\uff1f \u6ca1\u5173\u7cfb\uff0c\u8fd9\u4e0d\u662f\u4f60\u7684\u9519\uff0c\u6211\u89c9\u5f97\u8fd9\u5f20\u56fe\u672c\u8eab\u6709\u70b9\u95ee\u9898\uff0c\u8fd9\u5f20\u56fe\u5e94\u8be5\u5de6\u8f6c90\u5ea6\uff0c\u5927\u5bb6\u5e94\u8be5\u5c31\u5f88\u7528\u4ee5\u7406\u89e3\u4e86\u3002<\/p>\n<h3 id=\"git-flow\u5e38\u7528\u7684\u5206\u652f\">Git Flow\u5e38\u7528\u7684\u5206\u652f<\/h3>\n<ul>\n<li>Production \u5206\u652f<\/li>\n<\/ul>\n<p>\u4e5f\u5c31\u662f\u6211\u4eec\u7ecf\u5e38\u4f7f\u7528\u7684Master\u5206\u652f\uff0c\u8fd9\u4e2a\u5206\u652f\u6700\u8fd1\u53d1\u5e03\u5230\u751f\u4ea7\u73af\u5883\u7684\u4ee3\u7801\uff0c\u6700\u8fd1\u53d1\u5e03\u7684Release\uff0c \u8fd9\u4e2a\u5206\u652f\u53ea\u80fd\u4ece\u5176\u4ed6\u5206\u652f\u5408\u5e76\uff0c\u4e0d\u80fd\u5728\u8fd9\u4e2a\u5206\u652f\u76f4\u63a5\u4fee\u6539<\/p>\n<ul>\n<li>Develop \u5206\u652f<\/li>\n<\/ul>\n<p>\u8fd9\u4e2a\u5206\u652f\u662f\u6211\u4eec\u662f\u6211\u4eec\u7684\u4e3b\u5f00\u53d1\u5206\u652f\uff0c\u5305\u542b\u6240\u6709\u8981\u53d1\u5e03\u5230\u4e0b\u4e00\u4e2aRelease\u7684\u4ee3\u7801\uff0c\u8fd9\u4e2a\u4e3b\u8981\u5408\u5e76\u4e0e\u5176\u4ed6\u5206\u652f\uff0c\u6bd4\u5982Feature\u5206\u652f<\/p>\n<ul>\n<li>Feature \u5206\u652f<\/li>\n<\/ul>\n<p>\u8fd9\u4e2a\u5206\u652f\u4e3b\u8981\u662f\u7528\u6765\u5f00\u53d1\u4e00\u4e2a\u65b0\u7684\u529f\u80fd\uff0c\u4e00\u65e6\u5f00\u53d1\u5b8c\u6210\uff0c\u6211\u4eec\u5408\u5e76\u56deDevelop\u5206\u652f\u8fdb\u5165\u4e0b\u4e00\u4e2aRelease<\/p>\n<ul>\n<li>Release\u5206\u652f<\/li>\n<\/ul>\n<p>\u5f53\u4f60\u9700\u8981\u4e00\u4e2a\u53d1\u5e03\u4e00\u4e2a\u65b0Release\u7684\u65f6\u5019\uff0c\u6211\u4eec\u57fa\u4e8eDevelop\u5206\u652f\u521b\u5efa\u4e00\u4e2aRelease\u5206\u652f\uff0c\u5b8c\u6210Release\u540e\uff0c\u6211\u4eec\u5408\u5e76\u5230Master\u548cDevelop\u5206\u652f<\/p>\n<ul>\n<li>Hotfix\u5206\u652f<\/li>\n<\/ul>\n<p>\u5f53\u6211\u4eec\u5728Production\u53d1\u73b0\u65b0\u7684Bug\u65f6\u5019\uff0c\u6211\u4eec\u9700\u8981\u521b\u5efa\u4e00\u4e2aHotfix, \u5b8c\u6210Hotfix\u540e\uff0c\u6211\u4eec\u5408\u5e76\u56deMaster\u548cDevelop\u5206\u652f\uff0c\u6240\u4ee5Hotfix\u7684\u6539\u52a8\u4f1a\u8fdb\u5165\u4e0b\u4e00\u4e2aRelease<\/p>\n<h3 id=\"git-flow\u5982\u4f55\u5de5\u4f5c\">Git Flow\u5982\u4f55\u5de5\u4f5c<\/h3>\n<h4 id=\"\u521d\u59cb\u5206\u652f\">\u521d\u59cb\u5206\u652f<\/h4>\n<p>\u6240\u6709\u5728Master\u5206\u652f\u4e0a\u7684Commit\u5e94\u8be5Tag<\/p>\n<p><img decoding=\"async\" class=\"img-responsive\" src=\"https:\/\/images.cnblogs.com\/cnblogs_com\/cnblogsfans\/771108\/o_git-workflow-release-cycle-1historical.png\" \/><\/p>\n<h4 id=\"feature-\u5206\u652f\">Feature \u5206\u652f<\/h4>\n<p>\u5206\u652f\u540d feature\/*<\/p>\n<p>Feature\u5206\u652f\u505a\u5b8c\u540e\uff0c\u5fc5\u987b\u5408\u5e76\u56deDevelop\u5206\u652f, \u5408\u5e76\u5b8c\u5206\u652f\u540e\u4e00\u822c\u4f1a\u5220\u70b9\u8fd9\u4e2aFeature\u5206\u652f\uff0c\u4f46\u662f\u6211\u4eec\u4e5f\u53ef\u4ee5\u4fdd\u7559<\/p>\n<p><img decoding=\"async\" class=\"img-responsive\" src=\"https:\/\/images.cnblogs.com\/cnblogs_com\/cnblogsfans\/771108\/o_git-workflow-release-cycle-2feature.png\" \/><\/p>\n<h4 id=\"release\u5206\u652f\">Release\u5206\u652f<\/h4>\n<p>\u5206\u652f\u540d release\/*<\/p>\n<p>Release\u5206\u652f\u57fa\u4e8eDevelop\u5206\u652f\u521b\u5efa\uff0c\u6253\u5b8cRelease\u5206\u4e4b\u540e\uff0c\u6211\u4eec\u53ef\u4ee5\u5728\u8fd9\u4e2aRelease\u5206\u652f\u4e0a\u6d4b\u8bd5\uff0c\u4fee\u6539Bug\u7b49\u3002\u540c\u65f6\uff0c\u5176\u5b83\u5f00\u53d1\u4eba\u5458\u53ef\u4ee5\u57fa\u4e8e\u5f00\u53d1\u65b0\u7684Feature (\u8bb0\u4f4f\uff1a<span>\u4e00\u65e6\u6253\u4e86Release\u5206\u652f\u4e4b\u540e\u4e0d\u8981\u4eceDevelop\u5206\u652f\u4e0a\u5408\u5e76\u65b0\u7684\u6539\u52a8\u5230Release\u5206\u652f<\/span>)<\/p>\n<p>\u53d1\u5e03Release\u5206\u652f\u65f6\uff0c\u5408\u5e76Release\u5230Master\u548cDevelop\uff0c \u540c\u65f6\u5728Master\u5206\u652f\u4e0a\u6253\u4e2aTag\u8bb0\u4f4fRelease\u7248\u672c\u53f7\uff0c\u7136\u540e\u53ef\u4ee5\u5220\u9664Release\u5206\u652f\u4e86\u3002<\/p>\n<p><img decoding=\"async\" class=\"img-responsive\" src=\"https:\/\/images.cnblogs.com\/cnblogs_com\/cnblogsfans\/771108\/o_git-workflow-release-cycle-3release.png\" \/><\/p>\n<h4 id=\"\u7ef4\u62a4\u5206\u652f-hotfix\">\u7ef4\u62a4\u5206\u652f Hotfix<\/h4>\n<p>\u5206\u652f\u540d hotfix\/*<\/p>\n<p>hotfix\u5206\u652f\u57fa\u4e8eMaster\u5206\u652f\u521b\u5efa\uff0c\u5f00\u53d1\u5b8c\u540e\u9700\u8981\u5408\u5e76\u56deMaster\u548cDevelop\u5206\u652f\uff0c\u540c\u65f6\u5728Master\u4e0a\u6253\u4e00\u4e2atag<\/p>\n<p><img decoding=\"async\" class=\"img-responsive\" src=\"https:\/\/images.cnblogs.com\/cnblogs_com\/cnblogsfans\/771108\/o_git-workflow-release-cycle-4maintenance.png\" \/><\/p>\n<h3 id=\"git-flow\u4ee3\u7801\u793a\u4f8b\">Git Flow\u4ee3\u7801\u793a\u4f8b<\/h3>\n<p>a. \u521b\u5efadevelop\u5206\u652f<\/p>\n<pre><code class=\"hljs nginx\"><span class=\"hljs-attribute\">git<\/span> branch develop\r\ngit push -u origin develop    <\/code><\/pre>\n<p>b. \u5f00\u59cb\u65b0Feature\u5f00\u53d1<\/p>\n<pre><code class=\"hljs dockerfile\">git checkout -b some-feature develop\r\n<span class=\"hljs-comment\"># Optionally, push branch to origin:<\/span>\r\ngit push -u origin some-feature    \r\n\r\n<span class=\"hljs-comment\"># \u505a\u4e00\u4e9b\u6539\u52a8    <\/span>\r\ngit status\r\ngit <span class=\"hljs-keyword\">add<\/span><span class=\"bash\"> some-file\r\n<\/span>git commit    <\/code><\/pre>\n<p>c. \u5b8c\u6210Feature<\/p>\n<pre><code class=\"hljs perl\">git pull origin develop\r\ngit checkout develop\r\ngit merge --<span class=\"hljs-keyword\">no<\/span>-ff some-feature\r\ngit <span class=\"hljs-keyword\">push<\/span> origin develop\r\n\r\ngit branch -d some-feature\r\n\r\n<span class=\"hljs-comment\"># If you pushed branch to origin:<\/span>\r\ngit <span class=\"hljs-keyword\">push<\/span> origin --<span class=\"hljs-keyword\">delete<\/span> some-feature    <\/code><\/pre>\n<p>d. \u5f00\u59cbRelase<\/p>\n<pre><code class=\"hljs sql\">git checkout -b <span class=\"hljs-keyword\">release<\/span><span class=\"hljs-number\">-0.1<\/span><span class=\"hljs-number\">.0<\/span> develop\r\n\r\n# Optional: Bump <span class=\"hljs-keyword\">version<\/span> <span class=\"hljs-built_in\">number<\/span>, <span class=\"hljs-keyword\">commit<\/span>\r\n# <span class=\"hljs-keyword\">Prepare<\/span> <span class=\"hljs-keyword\">release<\/span>, <span class=\"hljs-keyword\">commit<\/span><\/code><\/pre>\n<p>e. \u5b8c\u6210Release<\/p>\n<pre><code class=\"hljs css\"><span class=\"hljs-selector-tag\">git<\/span> <span class=\"hljs-selector-tag\">checkout<\/span> <span class=\"hljs-selector-tag\">master<\/span>\r\n<span class=\"hljs-selector-tag\">git<\/span> <span class=\"hljs-selector-tag\">merge<\/span> <span class=\"hljs-selector-tag\">--no-ff<\/span> <span class=\"hljs-selector-tag\">release-0<\/span><span class=\"hljs-selector-class\">.1<\/span><span class=\"hljs-selector-class\">.0<\/span>\r\n<span class=\"hljs-selector-tag\">git<\/span> <span class=\"hljs-selector-tag\">push<\/span>\r\n\r\n<span class=\"hljs-selector-tag\">git<\/span> <span class=\"hljs-selector-tag\">checkout<\/span> <span class=\"hljs-selector-tag\">develop<\/span>\r\n<span class=\"hljs-selector-tag\">git<\/span> <span class=\"hljs-selector-tag\">merge<\/span> <span class=\"hljs-selector-tag\">--no-ff<\/span> <span class=\"hljs-selector-tag\">release-0<\/span><span class=\"hljs-selector-class\">.1<\/span><span class=\"hljs-selector-class\">.0<\/span>\r\n<span class=\"hljs-selector-tag\">git<\/span> <span class=\"hljs-selector-tag\">push<\/span>\r\n\r\n<span class=\"hljs-selector-tag\">git<\/span> <span class=\"hljs-selector-tag\">branch<\/span> <span class=\"hljs-selector-tag\">-d<\/span> <span class=\"hljs-selector-tag\">release-0<\/span><span class=\"hljs-selector-class\">.1<\/span><span class=\"hljs-selector-class\">.0<\/span>\r\n\r\n# <span class=\"hljs-selector-tag\">If<\/span> <span class=\"hljs-selector-tag\">you<\/span> <span class=\"hljs-selector-tag\">pushed<\/span> <span class=\"hljs-selector-tag\">branch<\/span> <span class=\"hljs-selector-tag\">to<\/span> <span class=\"hljs-selector-tag\">origin<\/span>:\r\n<span class=\"hljs-selector-tag\">git<\/span> <span class=\"hljs-selector-tag\">push<\/span> <span class=\"hljs-selector-tag\">origin<\/span> <span class=\"hljs-selector-tag\">--delete<\/span> <span class=\"hljs-selector-tag\">release-0<\/span><span class=\"hljs-selector-class\">.1<\/span><span class=\"hljs-selector-class\">.0<\/span>   \r\n\r\n\r\n<span class=\"hljs-selector-tag\">git<\/span> <span class=\"hljs-selector-tag\">tag<\/span> <span class=\"hljs-selector-tag\">-a<\/span> <span class=\"hljs-selector-tag\">v0<\/span><span class=\"hljs-selector-class\">.1<\/span><span class=\"hljs-selector-class\">.0<\/span> <span class=\"hljs-selector-tag\">master<\/span>\r\n<span class=\"hljs-selector-tag\">git<\/span> <span class=\"hljs-selector-tag\">push<\/span> <span class=\"hljs-selector-tag\">--tags<\/span><\/code><\/pre>\n<p>f. \u5f00\u59cbHotfix<\/p>\n<pre><code class=\"hljs css\"><span class=\"hljs-selector-tag\">git<\/span> <span class=\"hljs-selector-tag\">checkout<\/span> <span class=\"hljs-selector-tag\">-b<\/span> <span class=\"hljs-selector-tag\">hotfix-0<\/span><span class=\"hljs-selector-class\">.1<\/span><span class=\"hljs-selector-class\">.1<\/span> <span class=\"hljs-selector-tag\">master<\/span>    <\/code><\/pre>\n<p>g. \u5b8c\u6210Hotfix<\/p>\n<pre><code class=\"hljs css\"><span class=\"hljs-selector-tag\">git<\/span> <span class=\"hljs-selector-tag\">checkout<\/span> <span class=\"hljs-selector-tag\">master<\/span>\r\n<span class=\"hljs-selector-tag\">git<\/span> <span class=\"hljs-selector-tag\">merge<\/span> <span class=\"hljs-selector-tag\">--no-ff<\/span> <span class=\"hljs-selector-tag\">hotfix-0<\/span><span class=\"hljs-selector-class\">.1<\/span><span class=\"hljs-selector-class\">.1<\/span>\r\n<span class=\"hljs-selector-tag\">git<\/span> <span class=\"hljs-selector-tag\">push<\/span>\r\n\r\n\r\n<span class=\"hljs-selector-tag\">git<\/span> <span class=\"hljs-selector-tag\">checkout<\/span> <span class=\"hljs-selector-tag\">develop<\/span>\r\n<span class=\"hljs-selector-tag\">git<\/span> <span class=\"hljs-selector-tag\">merge<\/span> <span class=\"hljs-selector-tag\">--no-ff<\/span> <span class=\"hljs-selector-tag\">hotfix-0<\/span><span class=\"hljs-selector-class\">.1<\/span><span class=\"hljs-selector-class\">.1<\/span>\r\n<span class=\"hljs-selector-tag\">git<\/span> <span class=\"hljs-selector-tag\">push<\/span>\r\n\r\n<span class=\"hljs-selector-tag\">git<\/span> <span class=\"hljs-selector-tag\">branch<\/span> <span class=\"hljs-selector-tag\">-d<\/span> <span class=\"hljs-selector-tag\">hotfix-0<\/span><span class=\"hljs-selector-class\">.1<\/span><span class=\"hljs-selector-class\">.1<\/span>\r\n\r\n<span class=\"hljs-selector-tag\">git<\/span> <span class=\"hljs-selector-tag\">tag<\/span> <span class=\"hljs-selector-tag\">-a<\/span> <span class=\"hljs-selector-tag\">v0<\/span><span class=\"hljs-selector-class\">.1<\/span><span class=\"hljs-selector-class\">.1<\/span> <span class=\"hljs-selector-tag\">master<\/span>\r\n<span class=\"hljs-selector-tag\">git<\/span> <span class=\"hljs-selector-tag\">push<\/span> <span class=\"hljs-selector-tag\">--tags<\/span><\/code><\/pre>\n<h3 id=\"git-flow\u5de5\u5177\">Git flow\u5de5\u5177<\/h3>\n<p>\u5b9e\u9645\u4e0a\uff0c\u5f53\u4f60\u7406\u89e3\u4e86\u4e0a\u9762\u7684\u6d41\u7a0b\u540e\uff0c\u4f60\u5b8c\u5168\u4e0d\u7528\u4f7f\u7528\u5de5\u5177\uff0c\u4f46\u662f\u5b9e\u9645\u4e0a\u6211\u4eec\u5927\u90e8\u5206\u4eba\u5f88\u591a\u547d\u4ee4\u5c31\u662f\u8bb0\u4e0d\u4f4f\u5440\uff0c\u6d41\u7a0b\u5c31\u662f\u8bb0\u4e0d\u4f4f\u5440\uff0c\u80bf\u4e48\u529e\u5462\uff1f<\/p>\n<p>\u603b\u6709\u806a\u660e\u7684\u4eba\u521b\u9020\u597d\u7684\u5de5\u5177\u7ed9\u5927\u5bb6\u7528, \u90a3\u5c31\u662fGit flow script.<\/p>\n<h4 id=\"\u5b89\u88c5\">\u5b89\u88c5<\/h4>\n<ul>\n<li>OS X<\/li>\n<\/ul>\n<p>brew install git-flow<\/p>\n<ul>\n<li>Linux<\/li>\n<\/ul>\n<p>apt-get install git-flow<\/p>\n<ul>\n<li>Windows<\/li>\n<\/ul>\n<p>wget -q -O &#8211; &#8211;no-check-certificate https:\/\/github.com\/nvie\/gitflow\/raw\/develop\/contrib\/gitflow-installer.sh | bash<\/p>\n<h4 id=\"\u4f7f\u7528\">\u4f7f\u7528<\/h4>\n<ul>\n<li><strong>\u521d\u59cb\u5316:<\/strong>\u00a0git flow init<\/li>\n<li><strong>\u5f00\u59cb\u65b0Feature:<\/strong>\u00a0git flow feature start MYFEATURE<\/li>\n<li><strong>Publish\u4e00\u4e2aFeature(\u4e5f\u5c31\u662fpush\u5230\u8fdc\u7a0b):<\/strong>\u00a0git flow feature publish MYFEATURE<\/li>\n<li><strong>\u83b7\u53d6Publish\u7684Feature:<\/strong>\u00a0git flow feature pull origin MYFEATURE<\/li>\n<li><strong>\u5b8c\u6210\u4e00\u4e2aFeature:<\/strong>\u00a0git flow feature finish MYFEATURE<\/li>\n<li><strong>\u5f00\u59cb\u4e00\u4e2aRelease:<\/strong>\u00a0git flow release start RELEASE [BASE]<\/li>\n<li><strong>Publish\u4e00\u4e2aRelease:<\/strong>\u00a0git flow release publish RELEASE<\/li>\n<li><strong>\u53d1\u5e03Release:<\/strong>\u00a0git flow release finish RELEASE<br \/>\n\u522b\u5fd8\u4e86git push &#8211;tags<\/li>\n<li><strong>\u5f00\u59cb\u4e00\u4e2aHotfix:<\/strong>\u00a0git flow hotfix start VERSION [BASENAME]<\/li>\n<li><strong>\u53d1\u5e03\u4e00\u4e2aHotfix:<\/strong>\u00a0git flow hotfix finish VERSION<\/li>\n<\/ul>\n<p><img decoding=\"async\" class=\"img-responsive\" src=\"https:\/\/images.cnblogs.com\/cnblogs_com\/cnblogsfans\/771108\/o_git-flow-commands.png\" \/><\/p>\n<h3 id=\"git-flow-gui\">Git Flow GUI<\/h3>\n<p>\u4e0a\u9762\u8bb2\u4e86\u8fd9\u4e48\u591a\uff0c\u6211\u77e5\u9053\u8fd8\u6709\u4eba\u8bb0\u4e0d\u4f4f\uff0c\u90a3\u4e48\u53c8\u6709\u4eba\u505a\u51fa\u4e86GUI \u5de5\u5177\uff0c\u4f60\u53ea\u9700\u8981\u70b9\u51fb\u4e0b\u4e00\u6b65\u5c31\u884c\uff0c\u5de5\u5177\u5e2e\u4f60\u5e72\u8fd9\u4e9b\u4e8b\uff01\uff01\uff01<\/p>\n<h4 id=\"sourcetree\">SourceTree<\/h4>\n<p>\u5f53\u4f60\u7528Git-flow\u521d\u59cb\u5316\u540e\uff0c\u57fa\u672c\u4e0a\u4f60\u53ea\u9700\u8981\u70b9\u51fbgit flow\u83dc\u5355\u9009\u62e9start feature, release\u6216\u8005hotfix, \u505a\u5b8c\u540e\u518d\u6b21\u9009\u62e9git flow\u83dc\u5355\uff0c\u70b9\u51fbDone Action. \u6211\u52d2\u4e2a\u53bb\uff0c\u6211\u5b9e\u5728\u60f3\u4e0d\u5230\u8fd8\u6709\u6bd4\u8fd9\u66f4\u7b80\u5355\u7684\u4e86\u3002<\/p>\n<p>\u76ee\u524dSourceTree\u652f\u6301Mac, Windows, Linux.<\/p>\n<p>\u8fd9\u4e48\u597d\u7684\u5de5\u5177\u8bf7\u95ee\u591a\u5c11\u94b1\u5462\uff1f\u00a0<strong>\u514d\u8d39!!!!<\/strong><\/p>\n<p><img decoding=\"async\" class=\"img-responsive\" src=\"https:\/\/images.cnblogs.com\/cnblogs_com\/cnblogsfans\/771108\/o_source-tree-git-flow-init.png\" \/><\/p>\n<p><img decoding=\"async\" class=\"img-responsive\" src=\"https:\/\/images.cnblogs.com\/cnblogs_com\/cnblogsfans\/771108\/o_sourcetree-hero-mac-log.png\" \/><\/p>\n<h4 id=\"git-flow-for-visual-studio\">Git flow for visual studio<\/h4>\n<p>\u5e7f\u5927VS\u7684\u798f\u97f3<br \/>\n<a href=\"https:\/\/visualstudiogallery.msdn.microsoft.com\/27f6d087-9b6f-46b0-b236-d72907b54683\">GitFlow for Visual Studio<\/a><\/p>\n<p><img decoding=\"async\" class=\"img-responsive\" src=\"https:\/\/images.cnblogs.com\/cnblogs_com\/cnblogsfans\/771108\/o_gf_init-vs.png\" \/><\/p>\n<p><img decoding=\"async\" class=\"img-responsive\" src=\"https:\/\/images.cnblogs.com\/cnblogs_com\/cnblogsfans\/771108\/o_gf_features.png\" \/><\/p>\n<p><img decoding=\"async\" class=\"img-responsive\" src=\"https:\/\/images.cnblogs.com\/cnblogs_com\/cnblogsfans\/771108\/o_gf_finishfeature.png\" \/><\/p>\n<p><img decoding=\"async\" class=\"img-responsive\" src=\"https:\/\/images.cnblogs.com\/cnblogs_com\/cnblogsfans\/771108\/o_gf_features.png\" \/><\/p>\n<\/div>\n<\/div>\n","protected":false},"excerpt":{"rendered":"<p>Git \u5728\u56e2\u961f\u4e2d\u7684\u6700\u4f73\u5b9e\u8df5&#8211;\u5982\u4f55\u6b63\u786e\u4f7f\u7528Git Flow Git\u7684\u4f18\u70b9 Git\u7684\u4f18\u70b9\u5f88\u591a\uff0c\u4f46\u662f\u8fd9\u91cc [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"_links":{"self":[{"href":"https:\/\/adeqing.com\/index.php\/wp-json\/wp\/v2\/posts\/209"}],"collection":[{"href":"https:\/\/adeqing.com\/index.php\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/adeqing.com\/index.php\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/adeqing.com\/index.php\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/adeqing.com\/index.php\/wp-json\/wp\/v2\/comments?post=209"}],"version-history":[{"count":1,"href":"https:\/\/adeqing.com\/index.php\/wp-json\/wp\/v2\/posts\/209\/revisions"}],"predecessor-version":[{"id":210,"href":"https:\/\/adeqing.com\/index.php\/wp-json\/wp\/v2\/posts\/209\/revisions\/210"}],"wp:attachment":[{"href":"https:\/\/adeqing.com\/index.php\/wp-json\/wp\/v2\/media?parent=209"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/adeqing.com\/index.php\/wp-json\/wp\/v2\/categories?post=209"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/adeqing.com\/index.php\/wp-json\/wp\/v2\/tags?post=209"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}