{"id":37380,"date":"2023-08-03T14:19:19","date_gmt":"2023-03-21T13:34:02","guid":{"rendered":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit%e5%92%8cgit-flow-%e4%b8%aa%e4%ba%ba%e5%a4%87%e5%bf%98%e5%bd%95\/"},"modified":"2024-04-30T16:47:27","modified_gmt":"2024-04-30T08:47:27","slug":"%e5%85%b3%e4%ba%8egit%e5%92%8cgit-flow-%e4%b8%aa%e4%ba%ba%e5%a4%87%e5%bf%98%e5%bd%95","status":"publish","type":"post","link":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit%e5%92%8cgit-flow-%e4%b8%aa%e4%ba%ba%e5%a4%87%e5%bf%98%e5%bd%95\/","title":{"rendered":"\u5173\u4e8eGit\u548cgit-flow [\u4e2a\u4eba\u5907\u5fd8\u5f55]"},"content":{"rendered":"<h1>\u5173\u4e8eGit\u3002<\/h1>\n<h4>\u53c2\u8003\u7f51\u7ad9<\/h4>\n<p>\u7334\u5b50\u4e5f\u80fd\u7406\u89e3\u7684Git\u5165\u95e8\u6307\u5357\uff1ahttp:\/\/www.backlog.jp\/git-guide\/reference\/<\/p>\n<p>\u4f7f\u7528Git\u768420\u4e2a\u547d\u4ee4\uff0c\u4ee5\u7cbe\u901aGit\u7684\u6280\u5de7\uff08source:https:\/\/osdn.jp\/magazine\/09\/03\/16\/0831212\uff09<\/p>\n<p>\u786e\u8ba4git\u547d\u4ee4\u4e2d\u4e0egithub\u76f8\u5173\u7684\u4f20\u9001\u76ee\u6807\uff0c\u4f7f\u7528git remote -v\u547d\u4ee4\u3002\u8fd9\u4e2a\u547d\u4ee4\u8fd8\u53ef\u4ee5\u7528\u6765\u786e\u8ba4\u4e0eheroku\u76f8\u5173\u7684\u4f20\u9001\u76ee\u6807\u3002<\/p>\n<p>\u5c06git flow\u4ed3\u5e93\u63a8\u9001\u5230GitHub\uff0c\u547d\u4ee4\u4e3agit push -u origin master\uff08\u63a8\u9001\u5230\u4e3b\u5206\u652f\uff09\uff0c git push -u origin develop\uff08\u63a8\u9001\u5230\u5f00\u53d1\u5206\u652f\uff09\uff0cgit push -f origin master\uff08\u5f3a\u5236\u63a8\u9001\u5230\u4e3b\u5206\u652f\uff09\u3002<\/p>\n<p>\u5c06Github\u7684\u76ee\u7684\u5730\u6ce8\u518c\u4e3agit\u8fdc\u7a0badd origin git@github.com:hogehoge\/sample-app.git\u3002<\/p>\n<p>\u6ce8\u518cHeroku\u7684\u76ee\u7684\u5730<br \/>\ngit remote add heroku https:\/\/git.heroku.com\/sample.git<\/p>\n<p>\u30fb\u60f3\u8981\u66f4\u6539GitHub\u7684\u53d1\u9001\u5730\u5740\uff08\u60f3\u8981\u66f4\u6539\u5df2\u6ce8\u518c\u7684\u8fdc\u7a0b\u4ed3\u5e93\u7684\u5730\u5740\uff09\uff08\u66f4\u6539\u63a8\u9001\u5230GitHub\u65f6\u7684origin\u7684\u65b9\u6cd5\uff09\u53ef\u4ee5\u4f7f\u7528git remote set-url\u547d\u4ee4\uff08\u4ed3\u5e93\u540d\u79f0\uff09\uff08\u65b0\u4ed3\u5e93\u7684URL\uff09\u4f8b\u5982\uff1agit remote set-url origin git@github.com:hogehoge-app\/hoge_fuga.git \u203b\u5728GitHub\u4e0a\u7684\u60c5\u51b5\u4e0b\u3002<\/p>\n<p>\u5c06git\u8fdc\u7a0bURL\u8bbe\u7f6e\u4e3ahttps:\/\/hub.jazz.net\/git\/ailes\/Ailes.1\uff08\u4ec5\u9002\u7528\u4e8ebluemix\uff09\u3002<\/p>\n<p>\u5c06 Heroku \u7684\u8fdc\u7a0b URL \u8bbe\u7f6e\u4e3a https:\/\/git.heroku.com\/hogehoge-tor-7235.git \uff0e<\/p>\n<p>\u6267\u884c\u5b8c\u540e\uff0c\u8bf7\u4f7f\u7528git remote -v\u786e\u8ba4\u662f\u5426\u6b63\u786e\u4fee\u6539\u3002<\/p>\n<p>\u786e\u8ba4\u5f53\u524d\u4f4d\u4e8e\u54ea\u4e2a\u5206\u652f\u4e0a\u7684\u4fe1\u606f\uff0c\u8bf7\u67e5\u770bgit branch\u3002<\/p>\n<p>\u67e5\u770b\u63d0\u4ea4\u65e5\u5fd7\u7684git log<\/p>\n<p>\u5c55\u793a\u5df2\u7ecf\u8fdb\u884c\u4e86\u66f4\u6539\u7684\u6587\u4ef6\uff08\u53ef\u4ee5\u786e\u8ba4\u5dee\u5f02\u53d8\u66f4\uff09git status<\/p>\n<p>\u5c55\u793a\u5206\u652f\u5217\u8868 git branch -a<\/p>\n<p>\u30fb\u5220\u9664\u5206\u652fgit branch -d \u5206\u652f\u540d\u3000\u203b\u4f8b\u5982) git branch -d feature\/add-readme-dive<br \/>\n\u203b \u4f7f\u7528git branch\u786e\u8ba4\u5206\u652f\u662f\u5426\u5df2\u88ab\u5220\u9664\u203b \u7136\u540e\u6267\u884cgit pull (pull\u6307\u66f4\u65b0\u5dee\u5f02\uff0c\u83b7\u53d6\u6700\u65b0\u4fe1\u606f)\u203b \u5982\u679c\u6709\u672a\u5408\u5e76\u5230HEAD\u7684\u63d0\u4ea4\uff0c\u65e0\u6cd5\u5220\u9664\u5206\u652f\u3002 \u82e5\u8981\u5f3a\u5236\u5220\u9664\u5305\u542b\u672a\u5408\u5e76\u63d0\u4ea4\u7684\u5206\u652f\uff0c\u8bf7\u6dfb\u52a0-D\u9009\u9879\u6267\u884c\u3002<\/p>\n<p>\u5207\u6362\u5230\u6307\u5b9a\u5206\u652f\uff1agit checkout \u5206\u652f\u540d\uff0c\u4f8b\u5982\uff1agit checkout develop\u3002<\/p>\n<p>\u30fbGithub\u4e0a\u7684Pull Request\u65b9\u5f0f\uff08pull\u6307\u7684\u662f\u5dee\u5206\u66f4\u65b0\uff09http:\/\/qiita.com\/samurairunner\/items\/7442521bce2d6ac9330b<\/p>\n<p>\u4ece\u4e0a\u6b21\u63d0\u4ea4\u5230\u8fd9\u6b21\u6ce8\u518c\u7684\u5185\u5bb9\u5dee\u5f02\u786e\u8ba4git diff HEAD^ HEAD &#8211;stat\u3002<\/p>\n<h1>\u5173\u4e8eGit Flow\u7684\u5185\u5bb9<\/h1>\n<h2>\u5b89\u88c5Git Flow\uff08\u662f\u5426\u4e0d\u4f7f\u7528\uff1f\uff09<\/h2>\n<h2>\u56e2\u961f\u5f00\u53d1\uff08Git-Flow\u9886\u5bfc\u8005\u7248\uff09<\/h2>\n<h2>Git flow \u662f\u4e00\u79cd\u6d41\u7a0b<\/h2>\n<p>\u5728\u5f15\u5165git flow\u4e4b\u524d\uff0c\u9996\u5148\u5728GitHub\u4e0a\u521b\u5efa\u4e00\u4e2a\u4ed3\u5e93\u3002<\/p>\n<p>\u5728\u8fdb\u884c\u4ee5\u4e0b\u4f5c\u4e1a\u4e4b\u524d\uff0c\u5148\u5b8c\u6210\u4ee5\u4e0bURL\u4e2d\u7684\u4f5c\u4e1a\uff01\uff01<br \/>\n\u5c06Git\u4e0eGithub\u8fdb\u884c\u5173\u8054\uff08\u7b2c\u4e00\u6b21\uff0c\u521b\u5efa\u4e2a\u4eba\u4ed3\u5e93\uff09<\/p>\n<p>\u5728\u8fdb\u884c\u4efb\u52a1\u4e4b\u524d\uff0c\u9700\u5728GitHub\u4e0a\u8bbe\u7f6e\u91cc\u7a0b\u7891\uff08Milestone\uff09\u548c\u6ce8\u518c\u95ee\u9898\uff08Issue\uff09\uff01\uff01\u9996\u5148\uff0c\u521b\u5efaGitHub\u4ed3\u5e93\u65f6\u64b0\u5199README\u6587\u4ef6\uff0c\u6216\u5728Nitrous\u7684README\u6587\u4ef6\u4e2d\u5199\u5165\u3002\u5177\u4f53\u64cd\u4f5c\u8bf7\u53c2\u8003\u6587\u672c\u8bf4\u660e\u3002<\/p>\n<p>\u53c2\u8003\u7f51\u7ad9\uff1ahttp:\/\/www.atmarkit.co.jp\/ait\/articles\/1401\/06\/news013.html<\/p>\n<h4>[\u56e2\u961f\u7684\u60c5\u51b5\u4e0b] de xi\u00e0)<\/h4>\n<p>&nbsp;<\/p>\n<p>1. \u6536\u5230\u62db\u5f85\u90ae\u4ef6\u3002\u70b9\u51fb\u94fe\u63a5\u524d\u5f80GitHub\u9875\u9762\u3002<\/p>\n<p>&nbsp;<\/p>\n<p>2. \u8bf7\u590d\u5236SSH\u94fe\u63a5\u4e2d\u7684\u6587\u672c\u3002 \u590d\u5236\u540e\uff0c\u5728Nitrous\u4e2d\u7684\u5f53\u524d\u76ee\u5f55\u4f7f\u7528&#8221;code&#8221;\u72b6\u6001\u8fdb\u884c\u514b\u9686\u3002\u6267\u884c&#8221;git clone &#8220;\u52a0\u4e0a\u590d\u5236\u7684SSH\u6587\u672c\u5e76\u6309Enter\u3002\u203b\u6267\u884c&#8221;git clone&#8221;\u547d\u4ee4\uff0c\u5c06\u8fdc\u7a0b\u4ed3\u5e93\u590d\u5236\u5230\u672c\u5730\u4ed3\u5e93\u3002<\/p>\n<p>\u5728\u514b\u9686\u7684\u5e94\u7528\u7684\u5f53\u524d\u76ee\u5f55\u4e2d\u5b89\u88c5git flow\uff0c\u6267\u884csudo apt-get install git-flow\u547d\u4ee4\u3002\u5728\u63a7\u5236\u53f0\u4e2d\u8f93\u5165&#8221;git flow&#8221;\u547d\u4ee4\u5e76\u6267\u884c\uff0c\u5982\u679c\u663e\u793a\u4e86&#8221;usage: git flow&#8230;&#8221;\uff0c\u5219\u8868\u793a\u5b89\u88c5\u6210\u529f\u3002<\/p>\n<p>\u8fdb\u884cgit flow\u7684\u521d\u59cb\u8bbe\u7f6e\uff08\u5728\u514b\u9686\u5e94\u7528\u7a0b\u5e8f\u7684\u5f53\u524d\u76ee\u5f55\u4e2d\uff09<br \/>\ngit flow init -d \u203b\u9000\u51fagit flow\u7684\u521d\u59cb\u5316\u8bbe\u7f6e\u540e\uff0c\u5c06\u521b\u5efadevelop\u5206\u652f\u5e76\u5904\u4e8e\u8be5\u5206\u652f\u4e0a\u3002\u57fa\u672c\u4e0a\uff0c\u5728git flow\u4e2d\uff0c\u5e94\u7528\u7a0b\u5e8f\u662f\u5728develop\u5206\u652f\u4e0a\u8fdb\u884c\u5f00\u53d1\u7684\u3002<\/p>\n<p>\u5728GitHub\u4e0a\u521b\u5efadevelop\u5206\u652f\uff08\u5728\u521b\u5efaGitHub\u5b58\u50a8\u5e93\u65f6\uff0cmaster\u5206\u652f\u4f1a\u81ea\u52a8\u4f20\u9001\u5230GitHub\u5b58\u50a8\u5e93\uff09\u3002\u4f7f\u7528git push -u origin develop\u547d\u4ee4\u3002<\/p>\n<p>\uff16. \u5207\u51fa\u529f\u80fd\u5206\u652f\uff08\u529f\u80fd\u5206\u652f\u7531\u5f00\u53d1\u5206\u652f\u5207\u51fa\uff09\u3002\u4f8b\u5982\uff1agit checkout develop\uff08\u5207\u6362\u5230\u5f00\u53d1\u5206\u652f\uff09\uff1bgit flow feature start \u5206\u652f\u540d\uff1bgit flow feature start add-readme-tanaka\uff1bgit flow feature start add-user\u3002<\/p>\n<p>6. \u5f00\u59cb\u4efb\u52a1\u2192\u4efb\u52a1\u7ed3\u675f\u540egit add -Agit commit -m&#8221;\u6211\u7684\u4e2a\u4eba\u8d44\u6599&#8221;<\/p>\n<p>7. \u5f53\u63d0\u4ea4\u5b8c\u540e\uff0c\u63a5\u4e0b\u6765\u8981\u5c06\u672c\u5730\u4ed3\u5e93\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\uff0c\u4f7f\u7528\u547d\u4ee4 git push -u origin feature\/add-readme-tanaka\u203b \u6267\u884c\u8be5\u547d\u4ee4\u540e\uff0cGitHub\u4e0a\u5c06\u4f1a\u521b\u5efa\u4e00\u4e2afeature\u5206\u652f\u3002\u203b \u82e5\u8981\u521b\u5efaGitHub\u4e0a\u7684master\u5206\u652f\uff0c\u8bf7\u4f7f\u7528\u547d\u4ee4 git push -u origin master\u203b \u82e5\u8981\u521b\u5efadevelop\u5206\u652f\uff0c\u8bf7\u4f7f\u7528\u547d\u4ee4 git push -u origin develop\u3002<\/p>\n<p>8. \u6309\u4e0b\u63a8\u9001\u540e\uff0c\u786e\u8ba4\u5728GitHub\u4e0a\u662f\u5426\u6210\u529f\u63a8\u9001\u3002<\/p>\n<p>9. \u786e\u8ba4\u81ea\u5df1\u7684\u5206\u652f\u540e\uff0c\u6267\u884c\u62c9\u53d6\u8bf7\u6c42\u3002\u901a\u8fc7\u6267\u884c\u62c9\u53d6\u8bf7\u6c42\uff0c\u53ef\u4ee5\u786e\u8ba4\u81ea\u5df1\u771f\u6b63\u5f00\u53d1\u7684\u529f\u80fd\u3001\u4fee\u6539\u6216\u6dfb\u52a0\u7684\u5185\u5bb9\u662f\u5426\u53ef\u4ee5\u5408\u5e76\u5230develop\uff08\u4e3b\u5206\u652f\uff09\u4e2d\u3002\u5728\u62c9\u53d6\u8bf7\u6c42\u4e2d\u9700\u8be6\u7ec6\u63cf\u8ff0\u81ea\u5df1\u8fdb\u884c\u4e86\u4ec0\u4e48\u64cd\u4f5c\u3002\u4e0d\u6539\u53d8\u6807\u9898\u683c\u5f0f\uff0c\u5c06\u5185\u5bb9\u6dfb\u52a0\u5728\u6807\u9898\u540e\u9762\u3002<\/p>\n<p>&#8211; \u9009\u62e9\u53d1\u9001\u7684\u5206\u652f\uff08\u4ecemaster\u5230feature\/add-blog\uff09<br \/>\n&#8211; \u786e\u8ba4\u5de6\u4fa7\u663e\u793a\u53d1\u9001\u7684\u5206\u652f\u540d\u79f0\uff0c<br \/>\n\u70b9\u51fb[\u6bd4\u8f83\u5e76\u62c9\u53d6\u8bf7\u6c42]<br \/>\n&#8211; \u57fa\u672c\u5206\u652f: develop \u30fb\u30fb\u30fb\u6bd4\u8f83\u5206\u652f: feature\/add-blog<br \/>\n&#8211; \u8f93\u5165\u6807\u9898\u548c\u5185\u5bb9\uff0c<br \/>\n\u70b9\u51fb[\u521b\u5efa\u62c9\u53d6\u8bf7\u6c42]<br \/>\n\u203b\u7136\u540e\u7b49\u5f85\u5176\u4ed6\u6210\u5458\u67e5\u770b\uff0c\u5e76\u5c06\u5176\u5408\u5e76\u5230master\u5206\u652f\uff0c\u5982\u679c\u6709\u4fee\u6539\u70b9\uff0c\u5219\u7ee7\u7eed\u63d0\u4ea4\u5e76\u63a8\u9001\uff0c\u5c06\u5176\u7eb3\u5165develop\u6216master\u5206\u652f\u4e2d\u3002<\/p>\n<p>10. \u5f53\u6709\u65b0\u7684 Pull Request \u521b\u5efa\u65f6\uff0c\u5f00\u53d1\u8005\u4f1a\u8fdb\u884c\u5ba1\u67e5\u5e76\u51b3\u5b9a\u662f\u5426\u5408\u5e76\u3002<\/p>\n<p>11. \u5220\u9664\u4e0d\u518d\u9700\u8981\u7684\u7279\u6027\u5206\u652f\u3002P15 git checkout develop git branch -d feature\/add-readme-tanaka \u203b git branch -d \u5206\u652f\u540d<\/p>\n<p>\u4e3a\u4e86\u5c06\u5728GitHub\u4e0adevelop\u4e0a\u53cd\u6620\u7684\u5de5\u4f5c\u5185\u5bb9\u540c\u6b65\u5230\u672c\u5730git\u7684develop\u5206\u652f\u4e0a\uff0c\u9700\u8981\u5207\u6362\u5230develop\u5206\u652f\u3002\u4f7f\u7528\u547d\u4ee4git checkout develop\u203b [STEP1]\u5b89\u88c5Git Flow\u7684\u7b2c8\/9\u9875\u3002<\/p>\n<p>\u5c06\u5728GitHub\u4e0adevelop\u5206\u652f\u4e0a\u7684\u5de5\u4f5c\u5185\u5bb9\u540c\u6b65\u5230\u672c\u5730git\u7684develop\u5206\u652f\u4e0a\uff08\u901a\u8fc7pull\u83b7\u53d6\u6700\u65b0\u4fe1\u606f\uff09\u3002\u5982\u679c\u4e0d\u628a\u5b83\u66f4\u65b0\u5230\u6700\u65b0\u72b6\u6001\u800c\u5c1d\u8bd5push\uff0c\u53ef\u80fd\u4f1a\u9047\u5230\u5176\u4ed6\u6210\u5458\u5df2\u7ecf\u8fdb\u884cpush\u800c\u65e0\u6cd5\u6210\u529fpush\u7684\u60c5\u51b5\u3002\u5728\u8fdb\u884c\u5206\u652f\u64cd\u4f5c\u65f6\uff0c\u5982\u679c\u53ea\u60f3\u5c06\u66f4\u65b0\u5185\u5bb9\u53cd\u6620\u5230\u7279\u5b9a\u5206\u652f\u4e0a\uff0c\u53ef\u4ee5\u4f7f\u7528\u547d\u4ee4git pull origin \u5206\u652f\u540d\u3002[STEP1] Git flow\u7684\u5b89\u88c5\u7b2c8\/9\u9875\u3002<\/p>\n<p>\u5f53\u5f00\u53d1\u5b8c\u6210\u5e76\u8fdb\u5165\u5e94\u7528\u7a0b\u5e8f\u53d1\u5e03\u9636\u6bb5\u65f6\uff0c\u5728develop\u5206\u652f\u4e0a\u521b\u5efarelease\u5206\u652f\u3002\u5728release\u5206\u652f\u4e0a\u8fdb\u884c\u4e0e\u53d1\u5e03\u76f8\u5173\u7684\u5de5\u4f5c\u3002\u4e00\u822c\u6765\u8bf4\uff0c\u4e3b\u8981\u662f\u4fee\u6b63\u7ec6\u8282\u6587\u6863\u548c\u9519\u8bef\u3002\u5f53\u51c6\u5907\u5c31\u7eea\u5e76\u8981\u53d1\u5e03\u65f6\uff0c\u5c06release\u5206\u652f\u5408\u5e76\u5230master\u5206\u652f\u5e76\u6253\u4e0a\u53d1\u5e03\u6807\u7b7e\u3002\u901a\u8fc7\u8fd9\u6837\u505a\u53ef\u4ee5\u786e\u8ba4\u53d1\u5e03\u65f6\u7684\u6e90\u4ee3\u7801\u3002\u5728git-flow\u5206\u652f\u6a21\u578b\u4e2d\uff0c\u4e0d\u5728master\u5206\u652f\u4e0a\u8fdb\u884c\u63d0\u4ea4\u3002\u56e0\u6b64\uff0c\u901a\u8fc7\u67e5\u770bmaster\u5206\u652f\uff0c\u53ef\u4ee5\u4e86\u89e3\u53d1\u5e03\u7684\u4ee3\u7801\u72b6\u6001\u3002\u6b64\u5916\uff0c\u5c06\u5728release\u5206\u652f\u4e0a\u8fdb\u884c\u7684\u5de5\u4f5c\u5185\u5bb9\u540c\u65f6\u5408\u5e76\u5230develop\u5206\u652f\uff0c\u786e\u4fdd\u6700\u65b0\u7684\u5f00\u53d1\u7248\u672c\u5f97\u5230\u53cd\u6620\u3002\u8fd9\u6837\u53ef\u4ee5\u907f\u514d\u6f0f\u6389\u5728\u53d1\u5e03\u65f6\u8fdb\u884c\u7684\u7f3a\u9677\u4fee\u590d\u5bf9develop\u5206\u652f\u7684\u5f71\u54cd\u3002git flow release start v1.0\uff08\u4ecedevelop\u5206\u652f\u521b\u5efa\uff09<\/p>\n<p>\u8fdb\u884c\u4e0e\u53d1\u5e03\u76f8\u5173\u7684\u5de5\u4f5c\uff0c\u5982\u521b\u5efa\u8be6\u7ec6\u6587\u6863\u548c\u4fee\u590d\u9519\u8bef\u7b49\u3002<br \/>\n\u5b8c\u6210\u5de5\u4f5c\u540e\uff0c<br \/>\n\u2193<br \/>\n\u5c06\u5176\u5408\u5e76\u5230master\u5206\u652f\u3002\u6253\u4e0a\u53d1\u5e03\u6807\u7b7e\u3002<br \/>\n\u2193<br \/>\n\u5c06\u5728release\u5206\u652f\u4e0a\u8fdb\u884c\u7684\u5de5\u4f5c\u5185\u5bb9\u540c\u65f6\u5408\u5e76\u5230develop\u5206\u652f\u3002\u786e\u4fdddevelop\u5206\u652f\u6210\u4e3a\u6700\u65b0\u7684\u5f00\u53d1\u7248\u672c\u3002<br \/>\n\u5b8c\u6210\u5de5\u4f5c\u540e\uff0c<br \/>\ngit push -u origin release \/ v1.0<br \/>\n\u2193<br \/>\n\u9009\u62e9\u8981\u63a8\u9001\u7684\u5206\u652f\uff08master\u2192release\uff09<br \/>\n\u5728master\u5206\u652f\u4e0a\u53d1\u8d77Pull Request\u3002\u5982\u679c\u901a\u8fc7\uff0c\u5c06\u88ab\u5408\u5e76\u3002<br \/>\n\u2193<br \/>\n\u5728release\u5206\u652f\u4e0a\u8fdb\u884c\u7684\u5de5\u4f5c\u5185\u5bb9\u4e5f\u8981\u53d1\u8d77Pull Request\uff0c\u5e76\u901a\u8fc7\u540e\u8fdb\u884c\u5408\u5e76\u5230develop\u5206\u652f\u3002<\/p>\n<p>\u4ece\u4e3b\u5206\u652f\u521b\u5efa\u4e00\u4e2a\u70ed\u4fee\u590d\u5206\u652f\uff0c\u547d\u540d\u4e3agit flow hotfix start v1.0.1 \u3002<\/p>\n<p>\u30fb\u5982\u679c\u8981\u5c06\u4ee3\u7801\u63a8\u9001\u5230Heroku\uff08git push heroku master\uff09\uff0c\u5728\u5728GitHub\u4e0a\u5c06\u4ee3\u7801\u5408\u5e76\u5230master\u5206\u652f\u540e\uff0c\u7528git checkout\u547d\u4ee4\u5c06Nitrous\u7684\u5206\u652f\u5207\u6362\u5230master\u3002<br \/>\n\u2193<br \/>\n\u7136\u540e\u6267\u884cgit pull\u3002<br \/>\n\u2193<br \/>\n\u6700\u540e\u6267\u884cgit push heroku master\u3002<\/p>\n<p>\u3010\u91cd\u8981\u3011\u5728GitHub\u4e0a\u8fdb\u884c\u64cd\u4f5c<br \/>\n\u4e3a\u4e86\u9632\u6b62\u901a\u8fc7git push &#8211;force\u547d\u4ee4\u5f3a\u5236\u63a8\u9001\u5230\u5206\u652f\uff0c\u53ef\u4ee5\u6309\u7167\u4ee5\u4e0b\u6b65\u9aa4\uff1a<br \/>\n1. \u8fdb\u5165\u76f8\u5e94\u7684\u4ed3\u5e93\u5e76\u70b9\u51fb\u8bbe\u7f6e\uff08setting\uff09\u3002<br \/>\n2. \u8fdb\u5165\u5206\u652f\uff08Branches\uff09\u9009\u9879\u3002<br \/>\n3. \u52fe\u9009\u201c\u4fdd\u62a4\u6b64\u5206\u652f\u201d\uff08Protect this branch\uff09\u3002<br \/>\n4. \u52fe\u9009\u201c\u5408\u5e76\u524d\u8981\u6c42\u72b6\u6001\u68c0\u67e5\u901a\u8fc7\u201d\uff08require status checks to pass before merging\uff09\u3002<br \/>\n\u203b \u8fd9\u6837\u53ef\u4ee5\u9632\u6b62\u7531\u5f00\u53d1\u8d1f\u8d23\u4eba\u4ee5\u5916\u7684\u4eba\u8fdb\u884c\u5f3a\u5236\u63a8\u9001\u3002<\/p>\n<h2>Git Flow\u70b9<\/h2>\n<p>\u7279\u6027\u5206\u652f\u548c\u53d1\u884c\u5206\u652f\u662f\u4ece\u5f00\u53d1\u5206\u652f\u521b\u5efa\u7684\u3002<\/p>\n<p>\u70ed\u4fee\u590d\u5206\u652f\u662f\u4ece\u4e3b\u5206\u652f\uff08master\uff09\u521b\u5efa\u7684\u3002<\/p>\n<h2>Git\u6d41\u547d\u4ee4<\/h2>\n<p>\u521b\u5efa\u7279\u6027\u5206\u652f\uff08\u4ecedevelop\u5206\u652f\u5207\u51fa\u5206\u652f\uff09git flow feature start \u5206\u652f\u540d\u3000\u203b git flow feature start add-readme-tanaka\u3002<\/p>\n<p>\u786e\u8ba4git flow\u53ef\u4ee5\u4f7f\u7528\u7684\u547d\u4ee4<\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u5173\u4e8eGit\u3002 \u53c2\u8003\u7f51\u7ad9 \u7334\u5b50\u4e5f\u80fd\u7406\u89e3\u7684Git\u5165\u95e8\u6307\u5357\uff1ahttp:\/\/www.backlog.jp\/git-gu [&hellip;]<\/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-37380","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>\u5173\u4e8eGit\u548cgit-flow [\u4e2a\u4eba\u5907\u5fd8\u5f55] - 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\/\u5173\u4e8egit\u548cgit-flow-\u4e2a\u4eba\u5907\u5fd8\u5f55\/\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"\u5173\u4e8eGit\u548cgit-flow [\u4e2a\u4eba\u5907\u5fd8\u5f55]\" \/>\n<meta property=\"og:description\" content=\"\u5173\u4e8eGit\u3002 \u53c2\u8003\u7f51\u7ad9 \u7334\u5b50\u4e5f\u80fd\u7406\u89e3\u7684Git\u5165\u95e8\u6307\u5357\uff1ahttp:\/\/www.backlog.jp\/git-gu [&hellip;]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.silicloud.com\/zh\/blog\/\u5173\u4e8egit\u548cgit-flow-\u4e2a\u4eba\u5907\u5fd8\u5f55\/\" \/>\n<meta property=\"og:site_name\" content=\"Blog - Silicon Cloud\" \/>\n<meta property=\"article:published_time\" content=\"2023-03-21T13:34:02+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2024-04-30T08:47:27+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=\"2 \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\/%e5%85%b3%e4%ba%8egit%e5%92%8cgit-flow-%e4%b8%aa%e4%ba%ba%e5%a4%87%e5%bf%98%e5%bd%95\/\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit%e5%92%8cgit-flow-%e4%b8%aa%e4%ba%ba%e5%a4%87%e5%bf%98%e5%bd%95\/\",\"name\":\"\u5173\u4e8eGit\u548cgit-flow [\u4e2a\u4eba\u5907\u5fd8\u5f55] - Blog - Silicon Cloud\",\"isPartOf\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\"},\"datePublished\":\"2023-03-21T13:34:02+00:00\",\"dateModified\":\"2024-04-30T08:47:27+00:00\",\"author\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/6530331a63adef3b3443a1fab53a0e6e\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit%e5%92%8cgit-flow-%e4%b8%aa%e4%ba%ba%e5%a4%87%e5%bf%98%e5%bd%95\/#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit%e5%92%8cgit-flow-%e4%b8%aa%e4%ba%ba%e5%a4%87%e5%bf%98%e5%bd%95\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit%e5%92%8cgit-flow-%e4%b8%aa%e4%ba%ba%e5%a4%87%e5%bf%98%e5%bd%95\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.silicloud.com\/zh\/blog\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"\u5173\u4e8eGit\u548cgit-flow [\u4e2a\u4eba\u5907\u5fd8\u5f55]\"}]},{\"@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\/%e5%85%b3%e4%ba%8egit%e5%92%8cgit-flow-%e4%b8%aa%e4%ba%ba%e5%a4%87%e5%bf%98%e5%bd%95\/#local-main-organization-logo\",\"url\":\"\",\"contentUrl\":\"\",\"caption\":\"Blog - Silicon Cloud\"}]}<\/script>\n<!-- \/ Yoast SEO Premium plugin. -->","yoast_head_json":{"title":"\u5173\u4e8eGit\u548cgit-flow [\u4e2a\u4eba\u5907\u5fd8\u5f55] - 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\/\u5173\u4e8egit\u548cgit-flow-\u4e2a\u4eba\u5907\u5fd8\u5f55\/","og_locale":"zh_CN","og_type":"article","og_title":"\u5173\u4e8eGit\u548cgit-flow [\u4e2a\u4eba\u5907\u5fd8\u5f55]","og_description":"\u5173\u4e8eGit\u3002 \u53c2\u8003\u7f51\u7ad9 \u7334\u5b50\u4e5f\u80fd\u7406\u89e3\u7684Git\u5165\u95e8\u6307\u5357\uff1ahttp:\/\/www.backlog.jp\/git-gu [&hellip;]","og_url":"https:\/\/www.silicloud.com\/zh\/blog\/\u5173\u4e8egit\u548cgit-flow-\u4e2a\u4eba\u5907\u5fd8\u5f55\/","og_site_name":"Blog - Silicon Cloud","article_published_time":"2023-03-21T13:34:02+00:00","article_modified_time":"2024-04-30T08:47:27+00:00","author":"\u97f5, \u79d1","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"\u97f5, \u79d1","\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4":"2 \u5206"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"WebPage","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit%e5%92%8cgit-flow-%e4%b8%aa%e4%ba%ba%e5%a4%87%e5%bf%98%e5%bd%95\/","url":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit%e5%92%8cgit-flow-%e4%b8%aa%e4%ba%ba%e5%a4%87%e5%bf%98%e5%bd%95\/","name":"\u5173\u4e8eGit\u548cgit-flow [\u4e2a\u4eba\u5907\u5fd8\u5f55] - Blog - Silicon Cloud","isPartOf":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website"},"datePublished":"2023-03-21T13:34:02+00:00","dateModified":"2024-04-30T08:47:27+00:00","author":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/6530331a63adef3b3443a1fab53a0e6e"},"breadcrumb":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit%e5%92%8cgit-flow-%e4%b8%aa%e4%ba%ba%e5%a4%87%e5%bf%98%e5%bd%95\/#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit%e5%92%8cgit-flow-%e4%b8%aa%e4%ba%ba%e5%a4%87%e5%bf%98%e5%bd%95\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%85%b3%e4%ba%8egit%e5%92%8cgit-flow-%e4%b8%aa%e4%ba%ba%e5%a4%87%e5%bf%98%e5%bd%95\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.silicloud.com\/zh\/blog\/"},{"@type":"ListItem","position":2,"name":"\u5173\u4e8eGit\u548cgit-flow [\u4e2a\u4eba\u5907\u5fd8\u5f55]"}]},{"@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\/%e5%85%b3%e4%ba%8egit%e5%92%8cgit-flow-%e4%b8%aa%e4%ba%ba%e5%a4%87%e5%bf%98%e5%bd%95\/#local-main-organization-logo","url":"","contentUrl":"","caption":"Blog - Silicon Cloud"}]}},"_links":{"self":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37380","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=37380"}],"version-history":[{"count":2,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37380\/revisions"}],"predecessor-version":[{"id":93090,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37380\/revisions\/93090"}],"wp:attachment":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/media?parent=37380"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/categories?post=37380"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/tags?post=37380"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}