{"id":4352,"date":"2018-12-16T22:14:18","date_gmt":"2018-12-16T14:14:18","guid":{"rendered":"http:\/\/www.brofive.org\/?p=4352"},"modified":"2018-12-17T10:25:42","modified_gmt":"2018-12-17T02:25:42","slug":"git-%e4%bb%a3%e7%a0%81%e5%88%86%e6%94%af%e6%a8%a1%e5%9e%8b%ef%bc%883%ef%bc%89%ef%bc%9aatlassian-simple-git-flow-google-upstream","status":"publish","type":"post","link":"http:\/\/www.brofive.net\/?p=4352","title":{"rendered":"Git \u4ee3\u7801\u5206\u652f\u6a21\u578b\uff083\uff09\uff1aAtlassian Simple Git Flow & Google Upstream First"},"content":{"rendered":"

\u9664\u4e86\u4e4b\u524d\u63cf\u8ff0\u7684Gitflow\u3001Github Flow\u3001TBD\u548cGitLab Flow\u4e4b\u5916\uff0c\u4e1a\u754c\u8fd8\u6709\u5f88\u591a\u5176\u4ed6\u7684\u5206\u652f\u6a21\u578b\uff0c\u5176\u4e2d\u591a\u6570\u662f\u8ffd\u6c42\u7b80\u5355\u9ad8\u6548\u7684TBD\u6a21\u5f0f\uff0c\u6211\u4eec\u5728\u9009\u62e9Atlassian\u3001Google\u548c\u88abAtlassian\u6536\u8d2d\u7684BitBucket\u770b\u770b\uff0c\u53ef\u4ee5\u770b\u5230\u5927\u4f53\u4e0a\u4ed6\u4eec\u7684\u5de5\u4f5c\u6a21\u5f0f\u90fd\u662f\u8ffd\u6c42\u6781\u7b80\u7684\u5de5\u4f5c\u6d41\u3002<\/span><\/p>\n

\u672c\u7cfb\u5217\u4e00\u51713\u7bc7\u6587\u7ae0\uff1a<\/em><\/p>\n

\uff081\uff09GitFlow\u3001GitHubFlow \u548c TBD<\/a><\/em><\/p>\n

\uff082\uff09GitLab Flow<\/a><\/em><\/p>\n

\uff083\uff09Atlassian Simple Git Flow & Google Upstream<\/a><\/em><\/p>\n

\u4e00\u3001Atlassian Simple Git Workflow<\/span><\/strong><\/p>\n

Atlassian\u7b97\u662f\u76ee\u524d\u6700\u4e3b\u6d41\u7684\u5f00\u53d1\u7ba1\u7406\u5de5\u5177\u63d0\u4f9b\u5546\u4e86\uff0c\u8fd9\u51e0\u5e74\u9646\u7eed\u6536\u8d2d\u4e86OpsGen\u3001Trello\u3001StatusPage\u3001Bitbucket\u3001SourceTree\u3001Wikidocs\u7b49\u5f00\u53d1\u5de5\u5177\u63d0\u4f9b\u5546\uff0c\u57fa\u672c\u4e0a\u5df2\u7ecf\u5b8c\u6210\u4e86DevOps\u8f6c\u578b\u3002<\/span>Atlassian\u7684\u5efa\u8bae\u662f\u91c7\u7528\u7b80\u5355\u7684Git\u5de5\u4f5c\u6d41\u7a0b<\/span><\/a>\u3002\u4ed4\u7ec6\u770b\u5b8c\u4e86\u5176\u5efa\u8bae\u548c\u601d\u8def\uff0c\u5176\u5b9e\u548c\u6211\u4eec1995\u5e74\u624b\u5de5\u7248\u672c\u7ba1\u7406\u30011996\u5e74\u7528VSS\u7248\u672c\u7ba1\u7406\u7684\u601d\u8def\u4e00\u6837\uff0c\u90fd\u662f\u63d0\u524d\u5408\u5e76\u4ee3\u7801\uff0c\u907f\u514d\u6700\u540e\u4ee3\u7801\u5408\u5e76\u56f0\u96be\uff0c\u73b0\u5728\u6709\u4e2a\u65b0\u8bcd\u513f\u53eb\u505arebase\u3002<\/span><\/p>\n

\"image\"<\/span><\/a><\/p>\n

\u6574\u4f537\u4e2a\u6b65\u9aa4\u5982\u4e0b<\/span><\/a>\uff1a<\/span><\/p>\n

1. Start by pulling down the latest changes from master<\/span><\/h5>\n
2. Branch off to isolate the feature or bug-fix work in a branch<\/span><\/h5>\n
3. Now you can work on the feature<\/span><\/h5>\n
4. To keep your feature branch fresh and up to date with the latest changes in master, use rebase<\/span><\/h5>\n
5. When ready for feedback push your branch remotely and create a pull request<\/span><\/h5>\n
6. Perform a final rebase cleanup after the pull request has been approved<\/span><\/h5>\n
7. When development is complete record an explicit merge<\/span><\/h5>\n

\u4e8c\u3001Google Chromium Upstream First<\/span><\/strong><\/p>\n

\u6ca1\u5565\u592a\u591a\u5e72\u8d27\uff0c\u5927\u4f53\u610f\u601d\u662f\uff0c\u8981\u60f3\u88abChromium\u63a5\u53d7patch\uff0c\u5fc5\u987b\u9996\u5148\u88ab\u4e0a\u6e38\u7684\u793e\u533a\u63a5\u53d7\uff0c\u6bd4\u5982Linux Kernel\u3001Subsystem Maintainer\u7b49\u7b49\u3002\u8fd9\u79cd\u6a21\u5f0f\u53ef\u4ee5\u907f\u514d\u5f00\u53d1\u8005\u9762\u4e34\u592a\u591a\u7684\u5206\u652f\uff0c\u5f53\u7136\uff0c\u4e5f\u4f1a\u589e\u52a0\u8865\u4e01\u63a5\u6536\u5468\u671f<\/span><\/p>\n

\u4e09\u3001Bitbucket\u7684Git\u6d41\u7a0b\u6bd4\u8f83<\/span><\/strong><\/p>\n

\u8fd9\u4e2a\u6587\u7ae0\u5206\u6790\u4e86\u5404\u79cd\u6d41\u7a0b\uff1a<\/span><\/p>\n

1\u3001\u96c6\u4e2d\u5316\u7684\u5f00\u53d1\u6a21\u5f0f\uff1a\u57fa\u672c\u7c7b\u4f3c\u524d\u9762\u7684Simple Workflow\uff08TBD + Rebase\uff09\uff0c\u7ed9\u51fa\u4e86\u4f8b\u5b50\uff0c\u6bd4\u8f83\u7b80\u660e<\/span><\/p>\n

2\u3001Freature Branching\uff1a\u8fd9\u4e2a\u5f88\u7c7b\u4f3cGitLab Flow<\/span><\/p>\n

3\u3001GitFlow Workflow\uff1a\u8fd9\u4e2a\u662f\u6700\u590d\u6742\u7684Flow\uff0c\u4f46\u662f\u4f9d\u7136\u662f\u4e00\u4e2a\u4ed3\u5e93<\/span><\/p>\n

4\u3001Forking Flow\uff1a\u8fd9\u4e2a\u662f\u6bd4GitFlow\u66f4\u590d\u6742\uff0c\u6709\u4e24\u4e2a\u4ed3\u5e93<\/span><\/p>\n

\"image\"<\/a><\/p>\n

\u7ed3\u8bba\uff1a<\/span><\/p>\n

\u901a\u8fc7\u8fd93\u7bc7\u6587\u7ae0\u7684\u5206\u6790\uff0c\u57fa\u672c\u4e0a\u53ef\u4ee5\u770b\u5230\uff0cGit\u51fa\u73b0\u540e\uff0c\u5e76\u6ca1\u6709\u4ec0\u4e48\u65b0\u7684\u5f00\u53d1\u6a21\u578b\uff0c\u6700\u7b80\u5355\u7684\u3001\u6700\u590d\u6742\u7684\u90fd\u548c20\u5e74\u524d\u6211\u4eec\u7528VSS\u3001\u751a\u81f3\u624b\u5de5\u65b9\u5f0f\u7ba1\u7406\u4ee3\u7801\u5927\u540c\u5c0f\u5f02\uff0c\u53ea\u662f\u5de5\u5177\u6709\u6240\u4e0d\u540c\u3002\u8fd9\u5e94\u4e86\u4e00\u53e5\u8bdd\uff1a\u5de5\u5177\u662f\u6b7b\u7684\uff0c\u4eba\u662f\u6d3b\u7684<\/span>\u3002<\/span><\/strong><\/p>\n

\u76f8\u5173\u4fe1\u606f\uff1a<\/span><\/p>\n

https:\/\/en.wikipedia.org\/wiki\/Atlassian<\/span><\/a><\/p>\n

https:\/\/www.crunchbase.com\/search\/acquisitions\/field\/organizations\/num_acquisitions\/atlassian<\/span><\/a><\/p>\n

https:\/\/www.atlassian.com\/blog\/archives\/simple-git-workflow-simple<\/span><\/a><\/p>\n

https:\/\/www.atlassian.com\/git\/tutorials\/comparing-workflows<\/span><\/a><\/p>\n

https:\/\/www.chromium.org\/chromium-os\/chromiumos-design-docs\/upstream-first<\/span><\/a><\/p>\n","protected":false},"excerpt":{"rendered":"

\u9664\u4e86\u4e4b\u524d\u63cf\u8ff0\u7684Gitflow\u3001Github Flow\u3001TBD\u548cGitLab Flow\u4e4b\u5916\uff0c\u4e1a\u754c\u8fd8\u6709\u5f88\u591a\u5176\u4ed6\u7684\u5206…<\/p>\n","protected":false},"author":1,"featured_media":4350,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[156,237,300],"tags":[386,540,541,539,414,207],"views":5078,"_links":{"self":[{"href":"http:\/\/www.brofive.net\/index.php?rest_route=\/wp\/v2\/posts\/4352"}],"collection":[{"href":"http:\/\/www.brofive.net\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/www.brofive.net\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/www.brofive.net\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"http:\/\/www.brofive.net\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=4352"}],"version-history":[{"count":3,"href":"http:\/\/www.brofive.net\/index.php?rest_route=\/wp\/v2\/posts\/4352\/revisions"}],"predecessor-version":[{"id":4360,"href":"http:\/\/www.brofive.net\/index.php?rest_route=\/wp\/v2\/posts\/4352\/revisions\/4360"}],"wp:featuredmedia":[{"embeddable":true,"href":"http:\/\/www.brofive.net\/index.php?rest_route=\/wp\/v2\/media\/4350"}],"wp:attachment":[{"href":"http:\/\/www.brofive.net\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=4352"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/www.brofive.net\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=4352"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/www.brofive.net\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=4352"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}