{"id":426021,"date":"2021-04-02T21:21:12","date_gmt":"2021-04-02T13:21:12","guid":{"rendered":"http:\/\/4563.org\/?p=426021"},"modified":"2021-04-19T00:49:50","modified_gmt":"2021-04-18T16:49:50","slug":"git-%e5%b7%a5%e4%bd%9c%e6%b5%81%e7%a8%8b%e5%8f%8a%e5%88%86%e6%94%af%e7%ad%96%e7%95%a5","status":"publish","type":"post","link":"http:\/\/4563.org\/?p=426021","title":{"rendered":"Git \u5de5\u4f5c\u6d41\u7a0b\u53ca\u5206\u652f\u7b56\u7565"},"content":{"rendered":"<div>\n<div>\n<div>\n<h1>                  Git \u5de5\u4f5c\u6d41\u7a0b\u53ca\u5206\u652f\u7b56\u7565               <\/h1>\n<p> <\/p>\n<div>\n<div> <span>\u8cc7\u6df1\u5927\u4f6c : liuxing <\/span>  <span><i><\/i> 7<\/span> <\/div>\n<div> <\/div>\n<\/p><\/div>\n<\/p><\/div>\n<\/p><\/div>\n<div isfirst=\"1\"> <\/p>\n<p>\u672c\u6587\u9996\u53d1\u4e8e \u5218\u661f\u7684\u4e2a\u4eba\u7f51\u7ad9<\/p>\n<p><img decoding=\"async\" loading=\"lazy\" referrerpolicy=\"no-referrer\" rel=\"noreferrer\" src=\"http:\/\/4563.org\/wp-content\/uploads\/2021\/04\/f77fa3b452b34cde962036053093b401tplv-k3u1fbpfcp-watermark.image_.png\" alt=\"Git \u5de5\u4f5c\u6d41\u7a0b\u53ca\u5206\u652f\u7b56\u7565\" \/><\/p>\n<blockquote>\n<p>Git \u662f\u76ee\u524d\u4e16\u754c\u4e0a\u6700\u5148\u8fdb\u7684\u5206\u5e03\u5f0f\u7248\u672c\u63a7\u5236\u7cfb\u7edf\u3002\u5b83\u4f7f\u6211\u4eec\u66f4\u65b9\u4fbf\u7684\u8ddf\u8e2a\uff0c\u7ba1\u7406\u548c\u7ec4\u7ec7\u4ee3\u7801\u3002\u4e5f\u5e2e\u52a9\u4e86\u6211\u4eec\u66f4\u597d\u7684\u4e0e\u5176\u4ed6\u5f00\u53d1\u8005\u8fdb\u884c\u534f\u4f5c\u5f00\u53d1\u3002\u4f46\u662f\u6ca1\u6709\u89c4\u77e9\u4e0d\u6210\u65b9\u5706\u3002\u534f\u4f5c\u5f00\u53d1\u5fc5\u987b\u6709\u4e00\u4e2a\u89c4\u8303\u6765\u7ea6\u675f\u5404\u4e2a\u8d21\u732e\u8005\u7684\u884c\u4e3a\u3002\u8fd9\u4e2a\u89c4\u8303\u5c31\u662f Git \u5de5\u4f5c\u6d41\u7a0b(Git Workflow)\uff0c\u4e5f\u4e3a\u6211\u4eec\u89c4\u8303\u5404\u4e2a\u5206\u652f\u7ba1\u7406\u7b56\u7565\u7b49\u884c\u4e3a\u3002<\/p>\n<\/blockquote>\n<p>Git \u5de5\u4f5c\u6d41\u7a0b\u662f\u6709\u5173\u5982\u4f55\u4f7f\u7528 Git \u4ee5\u9ad8\u6548\u534f\u4f5c\u5f00\u53d1\u7684\u89c4\u5219\u6216\u7b56\u7565\u5efa\u8bae\uff0c\u4e0b\u6587\u8fd9\u4e9b\u5e38\u89c1\u5de5\u4f5c\u6d41\u7a0b\u53ea\u662f\u4f5c\u4e3a\u6307\u5bfc\u53c2\u8003\uff0c\u8fd9\u4e9b\u5de5\u4f5c\u6d41\u4e0d\u662f\u4e00\u6210\u4e0d\u53d8\u7684\uff0c\u6211\u4eec\u5e94\u8be5\u6839\u636e\u81ea\u5df1\u7684\u9879\u76ee\u9009\u62e9\u6216\u5236\u5b9a\u5408\u9002\u81ea\u5df1\u7684\u5de5\u4f5c\u6d41\u3002<\/p>\n<h2>\u96c6\u4e2d\u5f0f\u5de5\u4f5c\u6d41<\/h2>\n<p>\u9996\u5148\u6211\u4eec\u6765\u4ecb\u7ecd\u6700\u7b80\u5355\u7c97\u66b4\u7684\u96c6\u4e2d\u5f0f\u5de5\u4f5c\u6d41\uff0c\u5982\u679c\u4f60\u7528\u8fc7SVN\uff0c\u90a3\u4e48\u4f60\u53ef\u4ee5\u65e0\u75db\u5207\u6362\u5230 Git \u96c6\u4e2d\u5f0f\u5de5\u4f5c\u6d41\u3002\u8be5\u5de5\u4f5c\u6d41\u53ea\u7528\u5230 <code>master<\/code> \u8fd9\u4e00\u4e2a\u4e3b\u5206\u652f\u6765\u7ef4\u62a4\u6211\u4eec\u7684\u4ee3\u7801\uff0c\u8fd9\u4e5f\u662f\u8be5\u5de5\u4f5c\u6d41\u7684\u4e3b\u8981\u5de5\u4f5c\u65b9\u5f0f\u3002<\/p>\n<h3>\u5de5\u4f5c\u6d41\u7a0b\u793a\u4f8b<\/h3>\n<p>1 \u3001\u9996\u5148 clone \u8fdc\u7a0b\u4ed3\u5e93\u5230\u672c\u5730<\/p>\n<pre><code>git clone ssh:\/\/[email&#160;protected]\/path\/to\/repo.git <\/code><\/pre>\n<p>2 \u3001\u7136\u540e\u5728\u672c\u5730\u7684 master \u5206\u652f\u505a\u51fa\u4fee\u6539\u5b8c\u6210\u5f00\u53d1\u540e\uff0c\u521b\u5efa\u4e00\u4e2a\u63d0\u4ea4<\/p>\n<pre><code>git status # \u67e5\u770b\u672c\u5730\u4ed3\u5e93\u7684\u4fee\u6539\u72b6\u6001 git add # \u6682\u5b58\u6587\u4ef6 git commit # \u63d0\u4ea4\u6587\u4ef6 <\/code><\/pre>\n<p>3 \u3001\u7136\u540e\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93<\/p>\n<pre><code>git push origin master <\/code><\/pre>\n<p>4 \u3001 \u5982\u679c\u6b64\u65f6\u672c\u5730\u4ed3\u5e93\u4e0e\u8fdc\u7a0b\u4ed3\u5e93\u6709\u4e86\u5206\u6b67\uff0cGit \u5c06\u62d2\u7edd\u64cd\u4f5c\u5e76\u62a5\u9519\u3002\u8fd9\u65f6\u6211\u4eec\u5c31\u5e94\u8be5\u5148 pull \u8fdc\u7a0b\u4ed3\u5e93\u7684\u4fee\u6539\u5230\u672c\u5730\u4ed3\u5e93\u540e\u518d\u89e3\u51b3\u91cd\u65b0\u63a8\u9001<\/p>\n<pre><code>git pull --rebase origin master <\/code><\/pre>\n<p>5 \u3001\u5982\u679c\u6709\u51b2\u7a81\uff0cGit \u4f1a\u5728\u5408\u5e76\u6709\u51b2\u7a81\u7684\u63d0\u4ea4\u5904\u6682\u505c rebase \u8fc7\u7a0b\uff0c\u5e76\u62a5\u51fa\u9519\u8bef\u4fe1\u606f\uff0c\u6211\u4eec\u5728\u89e3\u51b3\u6389\u51b2\u7a81\u540e\u53ef\u4ee5\u4f7f\u7528\u4e00\u4e0b\u547d\u4ee4\u5c06\u66f4\u6539\u52a0\u5165\u6682\u5b58\u533a\u540e\u7ee7\u7eed\u53ea\u80fd\u6267\u884c rebase\uff1a<\/p>\n<pre><code>git add &lt;some-file&gt; git rebase --continue <\/code><\/pre>\n<p>\u5982\u679c\u9047\u5230\u4e00\u4e2a\u641e\u4e0d\u5b9a\u7684\u51b2\u7a81\uff0c\u8fd9\u53ef\u4ee5\u4f7f\u7528\u4e00\u4e0b\u547d\u4ee4\u6765\u7ec8\u6b62 rebase<\/p>\n<pre><code>git rebase --abort <\/code><\/pre>\n<h3>\u4e3b\u8981\u9075\u5faa\u539f\u5219<\/h3>\n<ul>\n<li>\u53ea\u7528\u5230 <code>master<\/code> \u8fd9\u4e00\u4e2a\u5206\u652f\uff0c\u6240\u6709\u7684\u4fee\u6539\u90fd\u63a8\u9001\u5230 master \u5206\u652f<\/li>\n<li><code>master<\/code> \u5206\u652f\u4ee3\u8868\u4e86\u9879\u76ee\u7684\u6b63\u5f0f\u53d1\u5e03\u7248\u672c\uff0c\u6240\u4ee5\u63d0\u4ea4\u5386\u53f2\u5e94\u8be5\u88ab\u5c0a\u91cd\u4e14\u662f\u7a33\u5b9a\u4e0d\u53d8\u7684<\/li>\n<li>pull \u4ee3\u7801\u65f6, \u6700\u597d\u4f7f\u7528 rebase \u800c\u4e0d\u662f\u751f\u6210\u4e00\u4e2a merge commit<\/li>\n<\/ul>\n<h3>\u4f18\u70b9<\/h3>\n<ul>\n<li>\u96c6\u4e2d\u5f0f\u5de5\u4f5c\u6d41\u4e3b\u8981\u4f18\u70b9\u662f\u7b80\u5355\uff0c\u975e\u5e38\u9002\u5408\u5c0f\u578b\u56e2\u961f<\/li>\n<li>\u5bf9\u4e8e\u8981\u4ece <code>SVN<\/code> \u8fc1\u79fb\u8fc7\u6765\u7684\u56e2\u961f\u6765\u8bf4\u5f88\u53cb\u597d<\/li>\n<\/ul>\n<h3>\u7f3a\u70b9<\/h3>\n<ul>\n<li>\n<p>\u5f53\u60a8\u7684\u56e2\u961f\u89c4\u6a21\u6269\u5927\u65f6\uff0c\u4e0a\u9762\u8be6\u8ff0\u7684\u51b2\u7a81\u89e3\u51b3\u8fc7\u7a0b\u53ef\u80fd\u4f1a\u6210\u4e3a\u74f6\u9888<\/p>\n<\/li>\n<li>\n<p>\u5b8c\u5168\u6ca1\u6709\u53d1\u6325 Git \u7684\u4f18\u52bf\uff0c\u5728\u5b9e\u9645\u4f7f\u7528 Git \u534f\u4f5c\u7684\u9879\u76ee\u5f00\u53d1\u4e2d\u5f88\u5c11\u4f7f\u7528\u96c6\u4e2d\u5f0f\u5de5\u4f5c\u6d41<\/p>\n<\/li>\n<\/ul>\n<p>\u5982\u679c\u5728\u7a0d\u5927\u7684\u56e2\u961f\u4e2d\u4f7f\u7528\u524d\u9762\u7684\u96c6\u4e2d\u5f0f\u5de5\u4f5c\u6d41\uff0c\u90a3\u4e48\u53ef\u80fd\u4f1a\u5728\u89e3\u51b3\u51b2\u7a81\u4e2d\u6d6a\u8d39\u5f88\u591a\u65f6\u95f4\u3002\u5728\u5b9e\u9645\u5f00\u53d1\u4e2d\u6211\u4eec\u57fa\u672c\u4e0a\u90fd\u662f\u90fd \u529f\u80fd\u9a71\u52a8\u5f0f\u5f00\u53d1\uff0c\u57fa\u4e8e\u529f\u80fd\u9700\u6c42\uff0c\u521b\u5efa\u76f8\u5e94\u7684\u5206\u652f\u8fdb\u884c\u5f00\u53d1\uff0c\u5b8c\u6210\u5f00\u53d1\u5408\u5e76\u5230\u4e3b\u5206\u652f\u540e\u518d\u88ab\u5220\u9664\u6389\u3002\u63a5\u4e0b\u6765\u6211\u4eec\u4ecb\u7ecd\u7684\u4e09\u4e2a\u5de5\u4f5c\u6d41\uff1aGitHub Flow\uff0cGit Flow \u53ca Gitlab Flow \u90fd\u662f\u57fa\u4e8e\u4e0d\u540c\u7684\u5206\u652f\u7ba1\u7406\u7b56\u7565\u8fd0\u4f5c\u7684\u3002<\/p>\n<h2>GitHub Flow \u5de5\u4f5c\u6d41<\/h2>\n<p>GitHub Flow \u662f\u4e00\u4e2a\u8f7b\u91cf\u7ea7\u7684\u57fa\u4e8e\u5206\u652f\u7684\u5de5\u4f5c\u6d41\u7a0b\u3002\u5b83\u7531 GitHub \u5728 2011 \u5e74\u521b\u5efa\u3002\u5206\u652f\u662f Git \u4e2d\u7684\u6838\u5fc3\u6982\u5ff5\uff0c\u5e76\u4e14 GitHub \u5de5\u4f5c\u6d41\u7a0b\u4e2d\u7684\u4e00\u5207\u90fd\u4ee5\u6b64\u4e3a\u57fa\u7840\u3002<\/p>\n<p>\u6700\u91cd\u8981\u7684\u7684\u4e00\u70b9\u5c31\u662f\uff1a**<code>main<\/code> \/ <code>master<\/code>\u5206\u652f\u4e2d\u7684\u4efb\u4f55\u5185\u5bb9\u59cb\u7ec8\u90fd\u662f\u53ef\u90e8\u7f72\u7684**\u3002\u5176\u4ed6\u5206\u652f\uff08\u529f\u80fd\u5206\u652f\uff09\u521b\u5efa\u7528\u4e8e\u65b0\u529f\u80fd\u548c\u9519\u8bef\u4fee\u590d\u7684\u5de5\u4f5c\uff0c\u5e76\u4e14\u5728\u5de5\u4f5c\u5b8c\u6210\u5e76\u7ecf\u8fc7\u68c0\u67e5\u540e\uff0c\u8fd9\u4e9b\u5206\u652f\u5c06\u5408\u5e76\u56de\u5230\u4e3b\u5206\u652f\u4e2d\u540e\u5220\u9664\u3002\u8fd9\u4e9b\u5206\u652f\u540d\u5e94\u8be5\u662f\u5177\u6709\u63cf\u8ff0\u6027\u7684\u5982 <code>refactor-authentication<\/code>, <code>user-content-cache-key<\/code>, <code>make-retina-avatars<\/code>\u3002<\/p>\n<h3>\u5de5\u4f5c\u6d41\u7a0b\u793a\u4f8b<\/h3>\n<p>1 \u3001\u9996\u5148 clone \u8fdc\u7a0b\u4ed3\u5e93\u5230\u672c\u5730<\/p>\n<pre><code>git clone ssh:\/\/[email&#160;protected]\/path\/to\/repo.git <\/code><\/pre>\n<p>2 \u3001\u6839\u636e\u8981\u5b9e\u73b0\u7684\u529f\u80fd\u521b\u5efa\u4e00\u4e2a\u65b0\u7684\u5206\u652f\uff0c\u5206\u652f\u540d\u5e94\u8be5\u5177\u6709\u63cf\u8ff0\u6027\uff0c\u5982\u5b9e\u73b0\u9274\u6743\u529f\u80fd\uff1afeature-auth<\/p>\n<pre><code>git checkout -b feature-auth <\/code><\/pre>\n<p>3 \u3001\u7136\u540e\u5c06\u65b0\u5de5\u4f5c\u63d0\u4ea4\u5230\u8be5\u5206\u652f\u4e0b\uff0c\u5e76\u5b9a\u671f\u5c06\u5de5\u4f5c\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93<\/p>\n<pre><code># \u521b\u5efa\u4e00\u4e2a commit git status # \u67e5\u770b\u672c\u5730\u4ed3\u5e93\u7684\u4fee\u6539\u72b6\u6001 git add # \u6682\u5b58\u6587\u4ef6 git commit # \u63d0\u4ea4\u6587\u4ef6  # \u5c06\u5206\u652f\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93 git push --set-upstream origin feature-auth <\/code><\/pre>\n<p>4 \u3001\u5f53\u4f60\u9700\u8981\u5e2e\u52a9\u6216\u8005\u53cd\u9988\uff0c\u6216\u662f\u4f60\u89c9\u5f97\u4f60\u5df2\u7ecf\u5b8c\u6210\u8be5\u529f\u80fd\u7684\u5de5\u4f5c\u51c6\u5907\u5408\u8fdb\u4e3b\u5206\u652f\u7684\u65f6\u5019\u521b\u5efa pull request<\/p>\n<p>5 \u3001\u5f53\u4f60\u7684\u8fd9\u90e8\u5206\u5de5\u4f5c\u5728 pull request \u4e2d\uff0c\u88ab review \u4ee5\u53ca approved \u540e\uff0c\u5219\u53ef\u4ee5\u5408\u5e76\u5230\u4e3b\u5206\u652f\u3002<\/p>\n<pre><code>git checkout master git pull git pull origin feature-auth git push <\/code><\/pre>\n<p>6 \u3001\u5408\u5e76\u5230\u4e3b\u5206\u652f\u540e\uff0c\u5e94\u7acb\u5373\u5bf9\u5176\u8fdb\u884c\u90e8\u7f72<\/p>\n<h3>\u4e3b\u8981\u9075\u5faa\u539f\u5219<\/h3>\n<ol>\n<li><code>master<\/code> \u5206\u652f\u4e2d\u7684\u4efb\u4f55\u5185\u5bb9\u90fd\u662f\u53ef\u90e8\u7f72\u7684<\/li>\n<li>\u8981\u8fdb\u884c\u65b0\u7684\u5de5\u4f5c\uff0c\u9700\u8981\u4ece\u4e3b\u5206\u652f<code>master<\/code> \u521b\u5efa\u51fa\u4e00\u4e2a\u5206\u652f\uff0c\u5e76\u7ed9\u51fa\u63cf\u8ff0\u6027\u7684\u540d\u79f0\uff08\u5982\uff1a<code>new-oauth2-scopes<\/code>\uff09<\/li>\n<li>\u672c\u5730\u7684\u4fee\u6539\u63d0\u4ea4\u5230\u8be5\u5206\u652f\uff0c\u5e76\u5b9a\u671f\u5c06\u4f60\u7684\u5de5\u4f5c\u63a8\u9001\u5230\u670d\u52a1\u5668\u4e0a\u7684\u540c\u4e00\u547d\u540d\u5206\u652f<\/li>\n<li>\u5f53\u4f60\u9700\u8981\u53cd\u9988\u6216\u5e2e\u52a9\u65f6\uff0c\u6216\u8005\u4f60\u8ba4\u4e3a\u5206\u652f\u5df2\u51c6\u5907\u597d\u8fdb\u884c\u5408\u5e76\u65f6\uff0c\u8bf7\u6253\u5f00\u4e00\u4e2aPull Request<\/li>\n<li>\u5728\u5176\u4ed6\u4eba Review \u5e76 Approved \u8be5\u529f\u80fd\u540e\uff0c\u4f60\u53ef\u4ee5\u5c06\u5176\u5408\u5e76\u5230 <code>master<\/code><\/li>\n<li>\u5408\u5e76\u5e76\u63a8\u9001\u5230\u540e\u4e3b\u5206\u652f<code>master<\/code>\uff0c\u4f60\u53ef\u4ee5\u5e76\u4e14\u5e94\u8be5\u7acb\u5373\u8fdb\u884c\u90e8\u7f72<\/li>\n<\/ol>\n<h3>\u4f18\u70b9<\/h3>\n<ul>\n<li>\u76f8\u6bd4\u4e8e\u524d\u6587\u4ecb\u7ecd\u7684\u96c6\u4e2d\u5f0f\u6d41\u7a0b\u66f4\u4e3a\u5408\u7406\u5b9e\u7528\uff0c\u53ef\u4ee5\u51cf\u5c11\u5de5\u4f5c\u4e2d\u7684\u51b2\u7a81<\/li>\n<li>\u7531\u4e8e\u5de5\u4f5c\u6d41\u7a0b\u7684\u7b80\u5355\u6027\uff0c\u6b64 Git \u5206\u652f\u7b56\u7565\u5bf9\u8fdb\u884c\u6301\u7eed\u4ea4\u4ed8\u548c\u6301\u7eed\u96c6\u6210\u5f88\u53cb\u597d\u3002<\/li>\n<li>\u5f53\u9700\u8981\u5728\u751f\u4ea7\u4e2d\u7ef4\u62a4\u5355\u4e2a\u7248\u672c\u65f6\uff0c\u5b83\u662f\u7406\u60f3\u7684\u9009\u62e9<\/li>\n<li>\u8fd9\u4e2a Git \u5206\u652f\u7b56\u7565\u975e\u5e38\u9002\u5408\u5c0f\u578b\u56e2\u961f\u548c Web \u5e94\u7528\u7a0b\u5e8f<\/li>\n<\/ul>\n<h3>\u7f3a\u70b9<\/h3>\n<ul>\n<li>\u8fd9\u79cd Git \u5206\u652f\u7b56\u7565\u65e0\u6cd5\u540c\u65f6\u652f\u6301\u591a\u4e2a\u7248\u672c\u7684\u4ee3\u7801\u7684\u90e8\u7f72<\/li>\n<li>\u6ca1\u6709\u89e3\u51b3\u90e8\u7f72\u3001\u73af\u5883\u533a\u5206\u3001releases \u3001Bug \u4fee\u590d\u76f8\u5173\u7684\u95ee\u9898<\/li>\n<li>\u751f\u4ea7\u4ee3\u7801\u5bb9\u6613\u53d8\u5f97\u4e0d\u7a33\u5b9a<\/li>\n<\/ul>\n<h2>Git Flow \u5de5\u4f5c\u6d41<\/h2>\n<p>\u57fa\u4e8e\u529f\u80fd\u5206\u652f\u7684\u5de5\u4f5c\u6d41\u662f\u4e00\u4e2d\u76f8\u5f53\u7075\u6d3b\u7684\u65b9\u5f0f\u3002\u4f46\u662f\u95ee\u9898\u4e5f\u662f\u6709\u65f6\u5019\u8fc7\u4e8e\u7075\u6d3b\u3002\u5bf9\u4e8e\u5927\u578b\u56e2\u961f\uff0c\u5e38\u5e38\u9700\u8981\u7ed9\u4e0d\u540c\u5206\u652f\u5206\u914d\u4e00\u4e2a\u66f4\u5177\u4f53\u7684\u89d2\u8272\u3002Git Flow \u5de5\u4f5c\u6d41\u662f\u7ba1\u7406\u529f\u80fd\u5f00\u53d1\u3001\u9884\u53d1\u5e03\u548c\u7ef4\u62a4\u7684\u5e38\u7528\u6a21\u5f0f\u3002<\/p>\n<p>Git Flow \u662f\u6700\u65e9\u8bde\u751f\u5e76\u4e14\u76f8\u5f53\u6d41\u884c\u7684\u5de5\u4f5c\u6d41\u7a0b\u3002\u5b83\u7531 Vincent Driessen \u4e8e 2010 \u5e74\u521b\u5efa\u3002Git Flow \u5de5\u4f5c\u6d41\u5b9a\u4e49\u4e86\u4e00\u4e2a\u56f4\u7ed5\u9879\u76ee\u53d1\u5e03\u7684\u4e25\u683c\u5206\u652f\u6a21\u578b\u3002\u867d\u7136\u6bd4 GitHub Flow \u7684\u529f\u80fd\u5206\u652f\u5de5\u4f5c\u6d41\u590d\u6742\u4e00\u70b9\uff0c\u4f46\u63d0\u4f9b\u4e86\u7528\u4e8e\u4e00\u4e2a\u5065\u58ee\u7684\u7528\u4e8e\u7ba1\u7406\u5927\u578b\u9879\u76ee\u7684\u6846\u67b6\u3002<\/p>\n<p>Git Flow \u5de5\u4f5c\u6d41\u6ca1\u6709\u7528\u8d85\u51fa\u529f\u80fd\u5206\u652f\u5de5\u4f5c\u6d41\u7684\u6982\u5ff5\u548c\u547d\u4ee4\uff0cGit Flow \u4e3a\u4e0d\u540c\u7684\u5206\u652f\u5206\u914d\u4e00\u4e2a\u5f88\u660e\u786e\u7684\u89d2\u8272\uff0c\u5e76\u5b9a\u4e49\u5206\u652f\u4e4b\u95f4\u5982\u4f55\u548c\u4ec0\u4e48\u65f6\u5019\u8fdb\u884c\u4ea4\u4e92\u3002<\/p>\n<h3>\u5de5\u4f5c\u6d41\u7a0b\u793a\u4f8b<\/h3>\n<p>\u5047\u8bbe\u4f60\u5df2\u7ecf\u521b\u5efa\u597d\u4e86\u4e2d\u592e\u4ed3\u5e93\uff0c\u5e76\u4e14\u5df2\u5c06\u5176 clone \u5230\u672c\u5730<\/p>\n<p>1 \u3001\u9996\u5148\u6211\u4eec\u6765\u4ece\u4e3b\u5206\u652f\u521b\u5efa\u4e00\u4e2a\u5f00\u53d1\u5206\u652f develop\uff0c \u5e76\u63a8\u9001\u5230\u670d\u52a1\u5668<\/p>\n<pre><code>git branch develop git push -u origin develop <\/code><\/pre>\n<p>\u4ee5\u540e\u8fd9\u4e2a\u5206\u652f\u5c06\u4f1a\u5305\u542b\u4e86\u9879\u76ee\u7684\u5168\u90e8\u5386\u53f2\uff0c\u800c <code>master<\/code> \u5206\u652f\u5c06\u53ea\u5305\u542b\u4e86\u90e8\u5206\u5386\u53f2<\/p>\n<p>2 \u3001\u63a5\u4e0b\u6765\u6211\u4eec\u5f00\u59cb\u5f00\u53d1\u65b0\u529f\u80fd\uff0c\u57fa\u4e8e develop \u5206\u652f\u521b\u5efa\u65b0\u7684\u529f\u80fd\u5206\u652f<\/p>\n<pre><code>git checkout -b some-feature develop <\/code><\/pre>\n<p>\u5e76\u5728\u81ea\u5df1\u7684\u529f\u80fd\u5206\u652f\u4e0a\u8fdb\u884c\u5f00\u53d1\u3001\u521b\u5efa\u63d0\u4ea4\uff1a<\/p>\n<pre><code>git status # \u67e5\u770b\u672c\u5730\u4ed3\u5e93\u7684\u4fee\u6539\u72b6\u6001 git add # \u6682\u5b58\u6587\u4ef6 git commit # \u63d0\u4ea4\u6587\u4ef6 <\/code><\/pre>\n<p>3 \u3001\u5f53\u4f60\u5728\u4f60\u7684\u5206\u652f\u4e0a\u5b8c\u6210\u5de5\u4f5c\uff0c\u51c6\u5907\u597d\u8fdb\u884c\u5408\u5e76\u65f6\uff0c\u8bf7\u6253\u5f00\u4e00\u4e2a Pull Request\uff0c\u7528\u4e8e\u5408\u5e76\u5230<code>develop<\/code>\u5206\u652f\u3002\u5982\u679c\u4f60\u7684\u56e2\u961f\u6ca1\u4f7f\u7528 Pull Request \u5219\u53ef\u4ee5\u76f4\u63a5\u5408\u5e76\u5230\u672c\u5730\u7684 develop \u5206\u652f\u7136\u540e\u63a8\u9001\u5230\u4e2d\u592e\u4ed3\u5e93\u3002<\/p>\n<pre><code>git pull origin develop git checkout develop  git merge --no-ff some-feature git push # \u5220\u9664\u672c\u5730\u5206\u652f git branch -d some-feature <\/code><\/pre>\n<p>\u5e76\u4e14\u5728\u529f\u80fd\u5206\u652f\u5408\u5e76\u540e\u5e94\u8be5\u7acb\u5373\u5220\u9664<\/p>\n<p>4 \u3001\u5f53\u6211\u4eec\u7684 <code>develop<\/code> \u5206\u652f\u8fdb\u884c\u5230\u9700\u8981\u53d1\u5e03\u65f6\uff0c\u9700\u8981\u4ece<code>develop<\/code>\u5206\u652f\u521b\u5efa\u4e00\u4e2a\u65b0\u7684\u53d1\u5e03\u5206\u652f\uff0c\u547d\u540d\u4e3a<code>release-*<\/code>\u6216<code>release\/*<\/code>\u3002\u8fd9\u4e00\u6b65\u4e5f\u786e\u5b9a\u4e86\u53d1\u5e03\u7684\u7248\u672c\u53f7\uff1a<\/p>\n<pre><code>git checkout -b release-0.1.0 develop <\/code><\/pre>\n<p>\u8fd9\u4e2a\u5206\u652f\u662f\u4e00\u4e2a\u9884\u53d1\u5e03\u7684\u7248\u672c\uff0c\u53ea\u505a bug \u4fee\u590d\u3001\u6587\u6863\u751f\u6210\u7b49\u9762\u5411\u53d1\u5e03\u7684\u4efb\u52a1\u3002\u65b0\u529f\u80fd\u4e0d\u518d\u6dfb\u52a0\u5230\u8fd9\u4e2a\u5206\u652f\u4e0a<\/p>\n<p>5 \u3001\u7ecf\u8fc7\u4e00\u7cfb\u5217\u6d4b\u8bd5\u786e\u8ba4\u6ca1\u6709\u95ee\u9898\uff0c\u51c6\u5907\u597d\u4e86\u5bf9\u5916\u53d1\u5e03\u540e\uff0c\u6211\u4eec\u9700\u8981\u5c06\u53d1\u5e03\u5206\u652f\u5408\u5e76\u5230 master \u5206\u652f\uff0c\u5e76\u6253\u4e0b tag<\/p>\n<pre><code>git checkout master git merge --no-ff release-0.1 git push <\/code><\/pre>\n<pre><code>git tag -a 0.1 -m \"release 0.1 publish\" master git push --tags <\/code><\/pre>\n<p>6 \u3001\u540c\u65f6\u6211\u4eec\u8fd8\u9700\u8981\u5c06\u8fd9\u4e2a\u53d1\u5e03\u5206\u652f\u5408\u5e76\u56de\u53bb master \u5206\u652f<\/p>\n<pre><code>git checkout develop git merge --no-ff release-0.1.0 git push <\/code><\/pre>\n<p>\u6700\u540e\u6211\u4eec\u8fd8\u9700\u8981\u5220\u9664\u6389\u8fd9\u4e2a\u53d1\u5e03\u5206\u652f release-0.1.0<\/p>\n<p>7 \u3001\u5982\u679c\u6211\u4eec\u7684\u7ebf\u4e0a\u7248\u672c\u51fa\u73b0\u95ee\u9898\u65f6\uff0c\u5c31\u9700\u8981\u521b\u5efa\u4e00\u4e2a\u7ef4\u62a4\u5206\u652f\uff0c\u7528\u4e8e\u5feb\u901f\u7ed9\u4ea7\u54c1\u6253\u8865\u4e01\u3002\u8fd9\u4e2a\u7ef4\u62a4\u5206\u652f\u9700\u8981\u4ece<code>master<\/code>\u5206\u652f\u4e0a\u521b\u5efa\uff0c\u63d0\u4ea4\u4fee\u6539\u4ee5\u89e3\u51b3\u95ee\u9898\uff0c\u7136\u540e\u518d\u76f4\u63a5\u5408\u5e76\u56de<code>master<\/code>\u5206\u652f\uff1a<\/p>\n<pre><code>git checkout -b hotfix-auth master <\/code><\/pre>\n<p>\u4fee\u590d\u5b8c\u6210\u540e\u5c06\u5176\u5408\u5e76\u5230 master \u5206\u652f<\/p>\n<pre><code>git checkout master git merge --no-ff hotfix-auth git push <\/code><\/pre>\n<p>\u540c\u65f6\u6253\u4e0b\u65b0\u7684 tag<\/p>\n<pre><code>git tag -a 0.1.1 -m \"release 0.1.1 publish\" master git push --tags <\/code><\/pre>\n<p>\u540c\u6837\u4e5f\u9700\u8981\u5c06\u4fee\u590d\u5206\u652f\u5408\u5e76\u5230 develop \u5206\u652f<\/p>\n<pre><code>git checkout develop git merge --no-ff hotfix-auth git push <\/code><\/pre>\n<p>\u6700\u540e\u5220\u9664\u6389\u8fd9\u4e2a\u70ed\u4fee\u590d\u5206\u652f<\/p>\n<pre><code>git branch -d hotfix-auth <\/code><\/pre>\n<h3>\u4e3b\u8981\u9075\u5faa\u539f\u5219<\/h3>\n<p>\u5b83\u57fa\u4e8e\u4e24\u4e2a\u957f\u671f\u7684\u4e3b\u8981\u5206\u652f\uff1a<\/p>\n<ul>\n<li>\u4e3b\u5206\u652f <code>master<\/code> \u8be5\u5206\u652f\u5305\u542b\u751f\u4ea7\u4ee3\u7801\u3002 \u8be5\u5206\u652f\u662f\u7a33\u5b9a\u7684\u53d1\u5e03\u7248<\/li>\n<li>\u5f00\u53d1\u5206\u652f <code>develop<\/code> \u6b64\u5206\u652f\u5305\u542b\u9884\u751f\u4ea7\u4ee3\u7801\u3002\u6240\u6709\u7684\u529f\u80fd\u5206\u652f\u5b8c\u6210\u540e\u9700\u8981\u5408\u5e76\u5230\u8be5\u5206\u652f<\/li>\n<\/ul>\n<p>\u5176\u6b21\u5728\u5f00\u53d1\u4e2d\u8fd8\u6709\u4e09\u79cd\u77ed\u671f\u5206\u652f<\/p>\n<ul>\n<li>\u529f\u80fd\u5206\u652f\uff08 feature branch \uff09\u529f\u80fd\u5206\u652f\u7528\u4e8e\u4e3a\u5373\u5c06\u53d1\u5e03\u7684\u7248\u672c\u5f00\u53d1\u65b0\u529f\u80fd\u3002\u4ece<code>develop<\/code>\u5206\u652f\u4e2d\u68c0\u51fa\u4e5f\u5fc5\u987b\u5408\u5e76\u56de<code>develop<\/code>\u3002<\/li>\n<li>\u8865\u4e01\u5206\u652f\uff08 hotfix branch \uff09\u8865\u4e01\u5206\u652f \u7528\u4e8e\u4fee\u590d\u7ebf\u4e0a bug, \u4ece master \u5206\u652f\u4e0a\u9762\u68c0\u51fa\u3002\u4fee\u590d\u7ed3\u675f\u4ee5\u540e\uff0c\u518d\u5408\u5e76\u8fdb master \u548c develop \u5206\u652f<\/li>\n<li>\u9884\u53d1\u5206\u652f\uff08 release branch \uff09\u9884\u53d1\u5e03\u5206\u652f\u7528\u4e8e\u751f\u6210\u4e00\u4e2a\u9884\u53d1\u5e03\u7248\u672c\u8fdb\u884c\u6d4b\u8bd5 \u9884\u53d1\u5e03\u5206\u652f\u662f\u4ece develop \u5206\u652f\u4e0a\u9762\u5206\u51fa\u6765\u7684\uff0c\u9884\u53d1\u5e03\u7ed3\u675f\u4ee5\u540e\uff0c\u5fc5\u987b\u5408\u5e76\u8fdb Develop \u548c Master \u5206\u652f\u3002\u5b83\u7684\u547d\u540d\uff0c\u53ef\u4ee5\u91c7\u7528 release-*\u7684\u5f62\u5f0f\u3002<\/li>\n<\/ul>\n<h3>\u4f18\u70b9<\/h3>\n<ul>\n<li>\u6574\u4e2a\u9879\u76ee\u751f\u547d\u5468\u671f\u5185\uff0c\u5206\u652f\u72b6\u6001\u5341\u5206\u5e72\u51c0\uff0c\u5404\u4e2a\u5206\u652f\u5404\u53f8\u5176\u804c<\/li>\n<li>\u5206\u652f\u7684\u547d\u540d\u9075\u5faa\u7cfb\u7edf\u7684\u6a21\u5f0f\uff0c\u4f7f\u5176\u66f4\u6613\u4e8e\u7406\u89e3<\/li>\n<li><code>master<\/code> \u548c <code>develop<\/code> \u5206\u652f\u5206\u522b\u8bb0\u5f55\u53d1\u5e03\u548c\u529f\u80fd\u5f00\u53d1\u7684\u5386\u53f2<\/li>\n<li>\u7531\u4e8e\u6709\u53d1\u5e03\u5206\u652f\uff0c\u5176\u4ed6\u6682\u4e0d\u53d1\u5e03\u7684\u529f\u80fd\u7684\u5f00\u53d1\u4e0d\u53d7\u53d1\u5e03\u7684\u5f71\u54cd\uff0c\u53ef\u4ee5\u7ee7\u7eed\u63d0\u4ea4<\/li>\n<li>\u7ef4\u62a4\u5206\u652f\u80fd\u5feb\u901f\u6253\u8865\u4e01\uff0c\u4e0d\u5f71\u54cd\u6b63\u5728\u5f00\u53d1\u7684\u529f\u80fd<\/li>\n<li>\u5f53\u751f\u4ea7\u4e2d\u9700\u8981\u591a\u4e2a\u7248\u672c\u65f6\uff0c\u5b83\u662f\u7406\u60f3\u7684\u9009\u62e9<\/li>\n<\/ul>\n<h3>\u7f3a\u70b9<\/h3>\n<ul>\n<li>\u8f83\u4e3a\u590d\u6742<\/li>\n<li>Git \u5386\u53f2\u8bb0\u5f55\u53d8\u5f97\u4e0d\u53ef\u8bfb<\/li>\n<li>\u9700\u8981\u7ef4\u62a4\u4e24\u4e2a\u957f\u671f\u5206\u652f <code>master<\/code> \u548c <code>develop<\/code><\/li>\n<li>\u4e0d\u65b9\u4fbf\u6301\u7eed\u4ea4\u4ed8\u548c\u6301\u7eed\u96c6\u6210<\/li>\n<\/ul>\n<h2>Gitlab Flow \u5de5\u4f5c\u6d41<\/h2>\n<p>GitLab Flow \u662f\u901a\u8fc7\u521b\u5efa\u5de5\u4f5c\u6d41 GitLab\u5728 2014 \u5e74\u3002\u5b83\u5c06\u529f\u80fd\u9a71\u52a8\u7684\u5f00\u53d1\u548c\u529f\u80fd\u5206\u652f\u4ee5\u53ca\u95ee\u9898\u8ddf\u8e2a\u7ed3\u5408\u5728\u4e00\u8d77\u3002\u5b83\u662f Git Flow \u4e0e GithubFflow \u7684\u7efc\u5408\u3002\u5b83\u5438\u53d6\u4e86\u4e24\u8005\u7684\u4f18\u70b9\uff0c\u65e2\u6709\u9002\u5e94\u4e0d\u540c\u5f00\u53d1\u73af\u5883\u7684\u5f39\u6027\uff0c\u53c8\u6709\u5355\u4e00\u4e3b\u5206\u652f\u7684\u7b80\u5355\u548c\u4fbf\u5229\u3002GitLab Flow \u548c GitHub Flow \u4e4b\u95f4\u7684\u6700\u5927\u533a\u522b\u662f GitLab Flow \u4e2d\u7684\u73af\u5883\u5206\u652f\u652f\u6301\uff08\u4f8b\u5982<code>staging<\/code>\u548c<code>production<\/code>\uff09\uff0c<\/p>\n<p>GitLab Flow \u7684\u6700\u5927\u539f\u5219\u53eb\u505a&#8221;\u4e0a\u6e38\u4f18\u5148&#8221;\uff08 upsteam first \uff09\uff0c\u5373\u53ea\u5b58\u5728\u4e00\u4e2a\u4e3b\u5206\u652f<code>master<\/code>\uff0c\u5b83\u662f\u6240\u6709\u5176\u4ed6\u5206\u652f\u7684&#8221;\u4e0a\u6e38&#8221;\u3002\u53ea\u6709\u4e0a\u6e38\u5206\u652f\u91c7\u7eb3\u7684\u4ee3\u7801\u53d8\u5316\uff0c\u624d\u80fd\u5e94\u7528\u5230\u5176\u4ed6\u5206\u652f\u3002<\/p>\n<p>GitLab Flow \u5206\u6210\u4e24\u79cd\u60c5\u5f62\u6765\u5e94\u4ed8\u4e0d\u540c\u7684\u5f00\u53d1\u6d41\u7a0b<\/p>\n<h3>\u6301\u7eed\u53d1\u5e03<\/h3>\n<p>\u5bf9\u4e8e\u6301\u7eed\u53d1\u5e03\u7684\u9879\u76ee\uff0c\u5b83\u5efa\u8bae\u5728<code>master<\/code>\u5206\u652f\u4ee5\u5916\uff0c\u518d\u5efa\u7acb\u4e0d\u540c\u7684\u73af\u5883\u5206\u652f\uff0c\u6bcf\u4e2a\u73af\u5883\u90fd\u4f1a\u6709\u5bf9\u5e94\u7684\u5206\u652f\u3002\u6bd4\u5982\uff0c\u5f00\u53d1\u73af\u5883\u7684\u5206\u652f\u662f<code>master<\/code>\uff0c\u9884\u53d1\u73af\u5883\u7684\u5206\u652f\u662f<code>pre-production<\/code>\uff0c\u751f\u4ea7\u73af\u5883\u7684\u5206\u652f\u662f<code>production<\/code>\u3002<\/p>\n<ul>\n<li>\u5f00\u53d1\u5206\u652f <code>master<\/code> \u7528\u4e8e\u53d1\u5e03\u5230\u6d4b\u8bd5\u73af\u5883\uff0c\u8be5\u5206\u652f\u4e3a\u53d7\u4fdd\u62a4\u7684\u5206\u652f<\/li>\n<li>\u9884\u53d1\u5206\u652f <code>pre-production<\/code> \u7528\u4e8e\u53d1\u5e03\u5230\u9884\u53d1\u73af\u5883\uff0c\u4e0a\u6e38\u5206\u652f\u4e3a <code>master<\/code><\/li>\n<li>\u6b63\u5f0f\u5206\u652f <code>production<\/code> \u7528\u4e8e\u53d1\u5e03\u5230\u6b63\u5f0f\u73af\u5883\uff0c\u4e0a\u6e38\u5206\u652f\u4e3a <code>pre-production<\/code><\/li>\n<\/ul>\n<p>\u5982\u679c\u751f\u4ea7\u73af\u5883(production)\u53d1\u751f\u9519\u8bef\uff0c\u5219\u8981\u5efa\u4e00\u4e2a\u65b0\u5206\u652f\u4fee\u6539\u5b8c\u540e\u5408\u5e76\u5230\u6700\u4e0a\u6e38\u7684\u5f00\u53d1\u5206\u652f(master)\u6b64\u65f6\u5c31\u662f Upstream first)\uff0c\u4e14\u7ecf\u8fc7\u6d4b\u8bd5\uff0c\u518d\u7ee7\u7eed\u5f80 pre-production branch\uff0c\u8981\u7ecf\u8fc7\u6d4b\u8bd5\u6ca1\u6709\u95ee\u9898\u4e86\u624d\u80fd\u591f\u518d\u5f80\u4e0b\u5408\u5e76\u5230\u751f\u4ea7\u73af\u5883\u3002<\/p>\n<h3>\u7248\u672c\u53d1\u5e03<\/h3>\n<p>\u5bf9\u4e8e&#8221;\u7248\u672c\u53d1\u5e03&#8221;\u7684\u9879\u76ee\uff0c\u5efa\u8bae\u7684\u505a\u6cd5\u662f\u6bcf\u4e00\u4e2a\u7a33\u5b9a\u7248\u672c\uff0c\u90fd\u8981\u4ece<code>master<\/code>\u5206\u652f\u62c9\u51fa\u4e00\u4e2a\u5206\u652f\uff0c\u6bd4\u5982<code>2-3-stable<\/code>\u3001<code>2-4-stable<\/code>\u7b49\u7b49\u3002<\/p>\n<p>\u518d\u51fa\u73b0 bug \u540e\uff0c\u6839\u636e\u5bf9\u5e94\u7684 release branch \u521b\u5efa\u4e00\u4e2a\u4fee\u590d\u5206\u652f\uff0c\u4fee\u590d\u5de5\u4f5c\u4e07\u548c\u57ce\u5462\u4e2a\u540e\uff0c\u4e00\u6837\u8981\u6309\u7740\u4e0a\u6e38\u4f18\u9009\u7684\u539f\u5219\uff0c\u5148\u5408\u5e76\u5230 master \u5206\u652f\uff0c\u7ecf\u8fc7\u6d4b\u8bd5\u624d\u80fd\u5230\u624d\u80fd\u591f\u5408\u5e76\u5230 release \u5206\u652f\uff0c\u5e76\u4e14\u6b64\u65f6\u8981\u66f4\u65b0\u5c0f\u7248\u672c\u53f7\u3002<\/p>\n<h3>\u5de5\u4f5c\u6d41\u7a0b\u793a\u4f8b<\/h3>\n<p>\u548c\u4e4b\u524d\u4e00\u6837\u3002\u9996\u5148 clone \u9879\u76ee\u5230\u672c\u5730<\/p>\n<p>1 \u3001\u5f53\u6211\u4eec\u8981\u5b9e\u73b0\u65b0\u529f\u80fd\u6216\u662f\u4fee\u590d bug \u65f6\u3002\u4ece master \u68c0\u51fa\u65b0\u7684\u5206\u652f\u5982\uff1afeature-auth<\/p>\n<pre><code>git checkout -b feature-auth <\/code><\/pre>\n<p>2 \u3001\u7136\u540e\u5728\u8be5\u5206\u652f\u4e0b\u8fdb\u884c\u5de5\u4f5c\uff0c\u5b8c\u6210\u540e\u521b\u5efa\u63d0\u4ea4<\/p>\n<pre><code>git status # \u67e5\u770b\u672c\u5730\u4ed3\u5e93\u7684\u4fee\u6539\u72b6\u6001 git add # \u6682\u5b58\u6587\u4ef6 git commit # \u63d0\u4ea4\u6587\u4ef6 <\/code><\/pre>\n<p>\u63a8\u9001\u4ee3\u7801\u5230\u8fdc\u7a0b\u4ed3\u5e93\uff0c<\/p>\n<pre><code>git push origin feature-auth <\/code><\/pre>\n<p>3 \u3001\u4ee3\u7801\u63a8\u9001\u5230\u4ed3\u5e93\u540e\uff0c\u81ea\u5b9a\u8fd0\u884c GitLab CI<\/p>\n<p>4 \u3001\u5f53\u6211\u4eec\u5f00\u53d1\u5b8c\u6210\u51c6\u5907\u5408\u5e76\u8fdb master \u65f6\uff0c\u5728 GitLab \u4e0a\u521b\u5efa\u4e00\u4e2a Merge Request<\/p>\n<p>5 \u3001\u9879\u76ee\u7ba1\u7406\u8005\u8fdb\u884c\u4ee3\u7801\u5ba1\u67e5\uff0c\u901a\u8fc7\u540e\uff0c\u5408\u5e76\u5230<code>master<\/code><\/p>\n<p>6 \u3001\u8fd0\u884c\u7b2c\u4e8c\u6b21 GitLab CI<\/p>\n<p>7 \u3001\u901a\u8fc7\u76f8\u5e94\u7684\u6d4b\u8bd5\u540e\uff0c\u5c06<code>master<\/code>\u5206\u652f\u5408\u5e76\u5230<code>stable<\/code>\uff0c\u5982\u679c\u662f\u65b0\u7248\u672c\u5219\u521b\u5efa\u4e00\u4e2a\u65b0\u7684<code>stable<\/code>\u5206\u652f<\/p>\n<p>8 \u3001\u4e3a<code>stable<\/code>\u6253\u4e0a tag\uff0c\u5e76\u8fdb\u884c\u53d1\u5e03<\/p>\n<h3>\u4e3b\u8981\u9075\u5faa\u539f\u5219<\/h3>\n<ol>\n<li>\u4f7f\u7528\u529f\u80fd\u5206\u652f\uff0c\u4e0d\u76f4\u63a5\u63d0\u4ea4\uff08 commit \uff09\u5230 master \u5206\u652f<\/li>\n<li>\u6d4b\u8bd5\u6240\u6709\u7684\u63d0\u4ea4\uff0c\u800c\u4e0d\u4ec5\u4ec5\u53ea\u5728 master \u5206\u652f\u4e0a<\/li>\n<li>\u5728\u6240\u6709\u7684\u63d0\u4ea4\u4e0a\uff0c\u8fd0\u884c\u6240\u6709\u7684\u6d4b\u8bd5\uff08\u5982\u679c\u4f60\u7684\u6d4b\u8bd5\u65f6\u95f4\u957f\u4e8e 5 \u5206\u949f\u5219\u8ba9\u5b83\u4eec\u5e76\u884c)<\/li>\n<li>\u5728\u5408\u5e76\u5230 master \u4e4b\u524d\u6267\u884c\u4ee3\u7801\u5ba1\u67e5\uff0c\u800c\u4e0d\u662f\u4e8b\u540e\u5ba1\u67e5<\/li>\n<li>\u90e8\u7f72\u662f\u81ea\u52a8\u7684\uff0c\u5e76\u57fa\u4e8e\u5206\u652f\u6216\u6807\u7b7e\uff08 tag \uff09<\/li>\n<li>\u6807\u7b7e\uff08 tag \uff09\u662f\u7531\u7528\u6237\u8bbe\u7f6e\u7684\uff0c\u800c\u4e0d\u662f\u7531 CI \u521b\u5efa<\/li>\n<li>\u53d1\u5e03\uff08 release \uff09\u662f\u57fa\u4e8e\u6807\u7b7e\uff08 tag \uff09\u7684<\/li>\n<li>\u6c38\u8fdc\u4e0d\u5bf9\u5df2\u63a8\u9001\u7684\u63d0\u4ea4\uff08 pushed commits \uff09\u8fdb\u884c\u53d8\u57fa\uff08 rebase \uff09<\/li>\n<li>\u6bcf\u4e2a\u4eba\u90fd\u4ece master \u5206\u652f\u5f00\u59cb\u5de5\u4f5c\uff0c\u76ee\u6807\u4e5f\u662f master \u5206\u652f<\/li>\n<li>\u5728 master \u5206\u652f\u4e2d\u4fee\u6b63\u9519\u8bef\uff0c\u5176\u6b21\u518d\u5230\u53d1\u5e03\u5206\u652f<\/li>\n<li>\u63d0\u4ea4\u4fe1\u606f\uff08 commit message \uff09\u5e94\u4f53\u73b0\u610f\u56fe<\/li>\n<\/ol>\n<h3>\u4f18\u70b9<\/h3>\n<ul>\n<li>\u5b83\u5b9a\u4e49\u4e86\u5982\u4f55\u8fdb\u884c\u6301\u7eed\u96c6\u6210\u548c\u6301\u7eed\u4ea4\u4ed8<\/li>\n<li>Git \u5386\u53f2\u8bb0\u5f55\u5e72\u51c0\u3001\u6613\u8bfb<\/li>\n<\/ul>\n<h3>\u7f3a\u70b9<\/h3>\n<ul>\n<li>\n<p>\u76f8\u6bd4\u8f83\u4e8e GitHub Flow \u66f4\u590d\u6742<\/p>\n<\/li>\n<li>\n<p>\u5f53\u9700\u8981\u5728\u751f\u4ea7\u4e2d\u7ef4\u62a4\u591a\u4e2a\u7248\u672c\u65f6\uff0c\u5b83\u53ef\u80fd\u4f1a\u50cf Git Flow \u4e00\u6837\u53d8\u5f97\u590d\u6742<\/p>\n<\/li>\n<\/ul>\n<h2>\u603b\u7ed3\u53ca\u5efa\u8bae<\/h2>\n<p>\u6ca1\u6709\u4e00\u4e2a\u4e07\u80fd\u7684\u9002\u5408\u6240\u6709\u9879\u76ee\u7684 Git \u5de5\u4f5c\u6d41\u7a0b\u53ca\u5206\u652f\u7b56\u7565\uff0c\u65e0\u8bba\u6700\u7ec8\u9009\u62e9\u54ea\u79cd\u7b56\u7565\uff0c\u4f60\u90fd\u53ef\u4ee5\u901a\u8fc7\u8fdb\u4e00\u6b65\u7684\u4fee\u6539\u6765\u4f18\u5316\u5b83\u3002\u5c31\u50cf\u524d\u6587\u6240\u8bf4\u7684\uff0cGit \u5de5\u4f5c\u6d41\u7a0b\u5bf9\u6211\u4eec\u63d0\u5347\u56e2\u961f\u751f\u4ea7\u529b\u975e\u5e38\u91cd\u8981\uff0c\u5728\u5236\u5b9a\u6211\u4eec\u7684\u5de5\u4f5c\u6d41\u7a0b\u65f6\uff0c\u5e94\u8be5\u5c3d\u91cf\u7b26\u5408\u6211\u4eec\u7684\u9879\u76ee\u5177\u4f53\u4e1a\u52a1\u9700\u6c42\u53ca\u5f00\u53d1\u73af\u5883\u3002\u4f46\u662f\u4e5f\u6709\u5982\u4e0b\u51e0\u70b9\u5c0f\u5efa\u8bae\uff1a<\/p>\n<ul>\n<li>\n<p>\u4e34\u65f6\u5206\u652f\u4e0d\u5e94\u8be5\u5b58\u5728\u592a\u4e45\uff0c\u6bcf\u4e2a\u5206\u652f\u5e94\u5c3d\u91cf\u4fdd\u6301\u7cbe\u7b80\uff0c\u7528\u5b8c\u5373\u5220<\/p>\n<\/li>\n<li>\n<p>\u5de5\u4f5c\u6d41\u5e94\u8be5\u5c3d\u91cf\u7b80\u5355\uff0c\u540c\u65f6\u65b9\u4fbf\u56de\u6eda<\/p>\n<\/li>\n<li>\n<p>\u5de5\u4f5c\u6d41\u7a0b\u5e94\u8be5\u7b26\u5408\u6211\u4eec\u7684\u9879\u76ee\u53d1\u5e03\u8ba1\u5212<\/p>\n<\/li>\n<\/ul>\n<h3>\u53c2\u8003\u94fe\u63a5<\/h3>\n<ul>\n<li>atlassian comparing workflows<\/li>\n<li>What are GitLab Flow best practices?<\/li>\n<li>A successful Git branching model<\/li>\n<li>Understanding the GitHub flow<\/li>\n<li>Introduction to GitLab Flow<\/li>\n<\/ul>\n<p>\u672c\u6587\u5b8c<\/p>\n<p>\u6b22\u8fce\u53ef\u4ee5\u5173\u6ce8\u6211\u7684\u516c\u4f17\u53f7\uff0c\u4e00\u8d77\u73a9\u800d\u3002\u6709\u6280\u672f\u5e72\u8d27\u4e5f\u6709\u626f\u6de1\u4e71\u8c08<\/p>\n<p><img decoding=\"async\" loading=\"lazy\" referrerpolicy=\"no-referrer\" rel=\"noreferrer\" src=\"http:\/\/4563.org\/wp-content\/uploads\/2021\/04\/675167e2adda46719442223988d2a98atplv-k3u1fbpfcp-zoom-1.image_.png\" alt=\"Git \u5de5\u4f5c\u6d41\u7a0b\u53ca\u5206\u652f\u7b56\u7565\" \/><\/p>\n<p>\u5de6\u624b\u4ee3\u7801\u53f3\u624b\u7816\uff0c\u629b\u7816\u5f15\u7389<\/p>\n<\/p><\/div>\n<div> <b>\u5927\u4f6c\u6709\u8a71\u8aaa<\/b> (<span>5<\/span>)        <\/div>\n<div> <\/div>\n<\/p><\/div>\n<\/p><\/div>\n<ul>\n<li data-pid=\"5718926\" data-uid=\"2\">\n<div>\n<div>\n<div> <span>\u8cc7\u6df1\u5927\u4f6c : labulaka521 <\/span>  <\/div>\n<div> <i title=\"\u5f15\u7528\"><\/i>  <span>          <\/span> <\/div>\n<\/p><\/div>\n<div>                                                             \u6211\u60f3\u628a\u8fd9\u73a9\u610f\u67d3\u6210\u7eff\u8272                                                            <\/div>\n<\/p><\/div>\n<\/li>\n<li data-pid=\"5718927\" data-uid=\"2\">\n<div>\n<div>\n<div> <span>\u4e3b<\/span> <span>\u8cc7\u6df1\u5927\u4f6c : liuxing <\/span>  <\/div>\n<div> <i title=\"\u5f15\u7528\"><\/i>  <span>          <\/span> <\/div>\n<\/p><\/div>\n<div>                                                             @labulaka521 \u54c8\u54c8\u54c8 \u5bb6\u6709\u513f\u5973                                                            <\/div>\n<\/p><\/div>\n<\/li>\n<li data-pid=\"5718928\" data-uid=\"2\">\n<div>\n<div>\n<div> <span>\u8cc7\u6df1\u5927\u4f6c : pocketz <\/span>  <\/div>\n<div> <i title=\"\u5f15\u7528\"><\/i>  <span>          <\/span> <\/div>\n<\/p><\/div>\n<div>                                                             \u8d5e\uff0c\u6700\u8fd1\u521a\u51c6\u5907\u4ece SVN \u5f80 git \u8f6c                                                            <\/div>\n<\/p><\/div>\n<\/li>\n<li data-pid=\"5718929\" data-uid=\"2\">\n<div>\n<div>\n<div> <span>\u8cc7\u6df1\u5927\u4f6c : MarioLuo <\/span>  <\/div>\n<div> <i title=\"\u5f15\u7528\"><\/i>  <span>          <\/span> <\/div>\n<\/p><\/div>\n<div>                                                             github flow \u4e0b codereview \u662f\u5148\u63d0 PR, \u8fd8\u662f\u5148\u6d4b\u8bd5\uff1f<br \/>1.\u5148\u6d4b\u8bd5\u540e\u518d\u63d0 PR, \u8fd9\u65f6\u5019\u5ba1\u67e5\u4ee3\u7801\u4f1a\u53d8\u66f4\u6709\u98ce\u9669<br \/>2.\u5148 PR \u5ba1\u67e5, \u4f46\u662f\u672a\u6d4b\u8bd5\u7684\u4ee3\u7801\u4e0d\u5c0f\u5fc3\u88ab\u5408\u5e76\u4e86\u7684\u98ce\u9669                                                            <\/div>\n<\/p><\/div>\n<\/li>\n<li data-pid=\"5718930\" data-uid=\"2\">\n<div>\n<div>\n<div> <span>\u4e3b<\/span> <span>\u8cc7\u6df1\u5927\u4f6c : liuxing <\/span>  <\/div>\n<div> <i title=\"\u5f15\u7528\"><\/i>  <span>          <\/span> <\/div>\n<\/p><\/div>\n<div>                                                             @MarioLuo https:\/\/guides.github.com\/introduction\/flow\/                                                            <\/div>\n<\/p><\/div>\n<\/li>\n<li>\n","protected":false},"excerpt":{"rendered":"<p>Git \u5de5\u4f5c\u6d41\u7a0b\u53ca\u5206\u652f\u7b56\u7565 \u8cc7\u6df1\u5927&hellip;<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":[],"categories":[],"tags":[],"_links":{"self":[{"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/posts\/426021"}],"collection":[{"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=426021"}],"version-history":[{"count":1,"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/posts\/426021\/revisions"}],"predecessor-version":[{"id":426024,"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/posts\/426021\/revisions\/426024"}],"wp:attachment":[{"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=426021"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=426021"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=426021"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}