<div dir="ltr">Hi Spencer,<div><br></div><div>By having the master branch flagged for a future 5.0 release, I am concerned that we are making contributions more difficult. Shouldn't master be the main branch on which most developments happen? Our goal is to enable the ease of contribution and to make frequent releases. </div><div><br></div><div><div>There are more than one way of dealing with branches. We need to agree on one strategy and document this well.</div></div><div><br></div><div>Andreas</div><div><br></div><div><br></div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Feb 19, 2015 at 2:09 AM, Spencer Bliven <span dir="ltr"><<a href="mailto:sbliven@ucsd.edu" target="_blank">sbliven@ucsd.edu</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"><div dir="ltr"><div><div><div>As a reminder to everyone, we're currently maintaining separate branches for patch, minor, and master which correspond to features for 4.0.1, 4.1.0, and 5.0.0 respectively. One thing that would really help with this is if everyone can make pull requests to the correct branch, rather than accepting the default of master. This can be done from the compare screen by selecting the appropriate base branch (on the left).<br><br></div>I also recommend maintaining local patch/minor/master branches, to allow testing with the correct features. I know this is a bit of a hassle, but let's at least give it a shot.<br><br></div>It is important to never merge master into either of the earlier branches. If features from master need to be back-ported to patch or minor, this can be done with git's cherry-pick command.<br><br></div>Cheers,<br>Spencer<br></div>
<br>_______________________________________________<br>
biojava-dev mailing list<br>
<a href="mailto:biojava-dev@mailman.open-bio.org">biojava-dev@mailman.open-bio.org</a><br>
<a href="http://mailman.open-bio.org/mailman/listinfo/biojava-dev" target="_blank">http://mailman.open-bio.org/mailman/listinfo/biojava-dev</a><br></blockquote></div><br><br clear="all"><div><br></div>
</div></div>