[Cs-dev] Release Branch Management
Date | 2013-11-08 16:04 |
From | Steven Yi |
Subject | [Cs-dev] Release Branch Management |
Hi All, Just FYI, there's been commits and a reuploading of the release/6.01.00 branch to origin (SourceForge). In general, once a release is finished, the release branch should be deleted. It was deleted and removed from origin. New changes should go into a develop, a feature branch from develop, or if necessary, a hotfix branch that is branched from master, then re-merged into master and develop when complete. It looks like the changes that were done were for Android. I'd recommend just merging in those changes into develop and deleting the release/6.01.00 branch. Thanks! steven ------------------------------------------------------------------------------ November Webinars for C, C++, Fortran Developers Accelerate application performance with scalable programming models. Explore techniques for threading, error checking, porting, and tuning. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60136231&iu=/4140/ostg.clktrk _______________________________________________ Csound-devel mailing list Csound-devel@lists.sourceforge.net |
Date | 2013-11-08 16:27 |
From | Michael Gogins |
Subject | Re: [Cs-dev] Release Branch Management |
Attachments | None None |
I merged my changes into develop before you deleted the release branch. I wasn't aware that you were planning to delete the release branch. I'll keep that in mind from now on. Best,
Mike ----------------------------------------------------- Michael GoginsIrreducible Productions http://michaelgogins.tumblr.com Michael dot Gogins at gmail dot com On Fri, Nov 8, 2013 at 11:04 AM, Steven Yi <stevenyi@gmail.com> wrote: Hi All, |
Date | 2013-11-08 16:34 |
From | Steven Yi |
Subject | Re: [Cs-dev] Release Branch Management |
Hi Michael, Yes, it's part of git-flow conventions. Since the release is done, it doesn't make sense to add anything more to it, and since the changes are merged back into develop and master, this history is preserved. It's no big deal, just wanted to keep things tidy. I take it then that it is safe to delete release/6.01.00 again from origin? Thanks! steven On Fri, Nov 8, 2013 at 11:27 AM, Michael Gogins |
Date | 2013-11-08 16:36 |
From | Michael Gogins |
Subject | Re: [Cs-dev] Release Branch Management |
Attachments | None None |
Go right ahead. Best, Mike -----------------------------------------------------
Michael GoginsIrreducible Productions http://michaelgogins.tumblr.com Michael dot Gogins at gmail dot com On Fri, Nov 8, 2013 at 11:34 AM, Steven Yi <stevenyi@gmail.com> wrote: Hi Michael, |
Date | 2013-11-08 16:53 |
From | Steven Yi |
Subject | Re: [Cs-dev] Release Branch Management |
Branch now deleted, thanks! On Fri, Nov 8, 2013 at 11:36 AM, Michael Gogins |