{"id":7955,"date":"2015-11-12T03:17:20","date_gmt":"2015-11-12T03:17:20","guid":{"rendered":"https:\/\/unknownerror.org\/index.php\/2015\/11\/12\/git-flow-and-master-with-multiple-parallel-release-branches-open-source-projects-facebook-flow\/"},"modified":"2015-11-12T03:17:20","modified_gmt":"2015-11-12T03:17:20","slug":"git-flow-and-master-with-multiple-parallel-release-branches-open-source-projects-facebook-flow","status":"publish","type":"post","link":"https:\/\/unknownerror.org\/index.php\/2015\/11\/12\/git-flow-and-master-with-multiple-parallel-release-branches-open-source-projects-facebook-flow\/","title":{"rendered":"Git-flow and master with multiple parallel release-branches-open source projects facebook\/flow"},"content":{"rendered":"<p><img decoding=\"async\" src=\"http:\/\/www.gravatar.com\/avatar\/f8b43ba72c2a51ea4904027af406ae23?s=128&amp;d=identicon&amp;r=PG\" \/> <strong>mstrap<\/strong><\/p>\n<p>In the git-flow model, your &#8220;latest released&#8221; version actually maps to the <code>master<\/code>, while your &#8220;preview release&#8221; maps to a git-flow <code>release<\/code> branch. It is forked from <code>develop<\/code> and finally merged into <code>master<\/code> when the actual release happens. Then this will become your &#8220;latest release&#8221; and you will usually fix only bugs for that release, using git-flow <code>hotfix<\/code>branches. In this way, your <code>master<\/code> always represents the most stable state of your latest released version.<\/p>\n<p>If you want to fix bugs for older releases or do any other develop there, you will fork a <code>support<\/code> branch from the appropriate commit in <code>master<\/code> (you will have <strong>all<\/strong> versions ever created there). <code>support<\/code> branches are still experimental (according to the docs) and are not well documented. But as you can see from the command line help:<\/p>\n<pre><code>usage: git flow support [list] [-v]\n       git flow support start [-F]  \n<\/code><\/pre>\n<p>these branches are just started and not intended to be merged back to <code>master<\/code> nor <code>develop<\/code>. This is usually fine, as fixes to &#8220;ancient&#8221; releases or features requested by customers to be implemented in &#8220;ancient&#8221; releases can&#8217;t or should not go back into <code>master<\/code>. If you still think, you want to port a fix to your main development line (represented by <code>master<\/code> and <code>develop<\/code>), just start a <code>hotfix<\/code>, cherry-pick your changes and finish the <code>hotfix<\/code>.<\/p>\n","protected":false},"excerpt":{"rendered":"<p>mstrap In the git-flow model, your &#8220;latest released&#8221; version actually maps to the master, while your &#8220;preview release&#8221; maps to a git-flow release branch. It is forked from develop and finally merged into master when the actual release happens. Then this will become your &#8220;latest release&#8221; and you will usually fix only bugs for that [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-7955","post","type-post","status-publish","format-standard","hentry","category-uncategorized"],"_links":{"self":[{"href":"https:\/\/unknownerror.org\/index.php\/wp-json\/wp\/v2\/posts\/7955","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/unknownerror.org\/index.php\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/unknownerror.org\/index.php\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/unknownerror.org\/index.php\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/unknownerror.org\/index.php\/wp-json\/wp\/v2\/comments?post=7955"}],"version-history":[{"count":0,"href":"https:\/\/unknownerror.org\/index.php\/wp-json\/wp\/v2\/posts\/7955\/revisions"}],"wp:attachment":[{"href":"https:\/\/unknownerror.org\/index.php\/wp-json\/wp\/v2\/media?parent=7955"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/unknownerror.org\/index.php\/wp-json\/wp\/v2\/categories?post=7955"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/unknownerror.org\/index.php\/wp-json\/wp\/v2\/tags?post=7955"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}