I stepped away from the git-flow as it didn't seem to handle where we'd got to with having a branch-0.60 hanging around for a while...changes were cherry picked into there from the develop branch. Git-flow doesn't seem to like cherry picking, and I think we'd outgrown its release process.
w.r.t master I think we should just force merge the 0.60 branch into it On 22 November 2014 at 20:22, Josh Elser <[email protected]> wrote: > Oh right. I also made the release-0.60.0 tag and pushed that. > > I did *not* merge that tag into master because there was a merge conflict > (which, as far as I understand it, shouldn't even happen with the git-flow > model). > > SLIDER-398 (specifically 8434b8971af93fe316e4b4c9f6d4a2a917caedd0) > appears to only exist in master and not in any other release. I believe > that the proper course of action would be to revert the commit in master, > merge the tag into master, and then reapply the change to master (if > necessary) and merge master back into develop so we don't run into this > again for the next release. Thoughts before I go ahead and do this? > > > Josh Elser wrote: > >> Status update: vote on general@incubator closed yesterday with success. >> Here's where we stand now: >> >> * Artifacts are uploaded to dist.apache.org (should be propagated by >> Sunday 1400 EST) >> * Updated the website for the release >> >> Things that need to be done: >> >> * Write up release notes - >> http://slider.incubator.apache.org/release_notes/release-0.60.0.html. I >> haven't done this because I haven't kept up to date well enough to give >> adequate credit to the new things in 0.60.0. >> * Send out announcement after mirrors update >> >> I think that's all.. >> >> - Josh >> > -- CONFIDENTIALITY NOTICE NOTICE: This message is intended for the use of the individual or entity to which it is addressed and may contain information that is confidential, privileged and exempt from disclosure under applicable law. If the reader of this message is not the intended recipient, you are hereby notified that any printing, copying, dissemination, distribution, disclosure or forwarding of this communication is strictly prohibited. If you have received this communication in error, please contact the sender immediately and delete it from your system. Thank You.
