Hi,
this is something we already did in the previous release candidate, but
I think is interesting to describe with detail.
According what we discusses back in January, we agreed on using a
branching workflow, as described at [1].
Then, when the RC5 vote started, we opened a new develop branch where
continue working on all features would not go in the release, but for
3.1.0-incubating-SNAPSHOT. We kept the master, and there I was fixing of
the issues with the release itself.
Some of the changes pushed to develop where actually bug fixes that may
be interesting to release; so I merged those concrete commits (cherry
pick) before normally proceeding with the release process [2].
So, what I just did this morning is to merge all changes we did in
master into develop. This allows us to continue working on develop while
we are in the voting process, and manage back in case it fails.
Please, do not hesitate to ask any question about the workflow. I think
the discussion would be quite rewarding for all of us.
Kind regards,
[1] http://marmotta.incubator.apache.org/development.html
[2] http://wiki.apache.org/marmotta/ReleaseProcess
--
Sergio Fernández
