If a VOTE has taken place based on a tag, then that tag should be considered immutable regardless of the VOTE outcome.
Gary On Mon, Oct 10, 2016 at 11:00 AM, Matt Sicker <[email protected]> wrote: > You should make a new RC tag. I don't think it's a good idea to delete > tags. > > On 10 October 2016 at 11:24, Benedikt Ritter <[email protected]> wrote: > > > Hi, > > > > Oliver Heger <[email protected]> schrieb am So., 9. Okt. 2016 > > um > > 18:00 Uhr: > > > > > > > > > > > Am 09.10.2016 um 17:50 schrieb Matt Sicker: > > > > You can do a git rebase on the release branch to get master back in, > > > though > > > > if you've already run the version update stuff on it, I'm not > > completely > > > > sure how that works (though it should work out just fine). > > > > > > I would also go for the rebase approach. In case it helps, I also > > > uploaded the patch to the Jira ticket. > > > > > > > Fine by me. We can incorporate LANG-1275 into 3.5. Oliver can add his > > changes and then I rebase release onto master. What happens with the > > already published RC1 tag? the tag points to the commit with ID 4b2ec07. > It > > won't be moved to the rebased commit. Do I delete it and point it to the > > rebased commit? > > > > Benedikt > > > > > > > > > > Oliver > > > > > > > > > > > On 9 October 2016 at 06:37, Benedikt Ritter <[email protected]> > > wrote: > > > > > > > >> Hello Oliver, > > > >> > > > >> Oliver Heger <[email protected]> schrieb am Sa., 8. Okt. > > > 2016 > > > >> um > > > >> 16:50 Uhr: > > > >> > > > >>> Hi, > > > >>> > > > >>> for LANG-1275 which I have just created I already have a fix that I > > > >>> could directly commit. Is it okay to do this or would this > interfere > > > >>> with the preparations for the 3.5 release? > > > >>> > > > >> > > > >> Sorry for the late reply. I'm currently not sure how to get this > into > > > the > > > >> release branch. Do I have to rebase the release branch onto master? > Or > > > do I > > > >> merge master to release? > > > >> > > > >> Regards, > > > >> Benedikt > > > >> > > > >> > > > >>> > > > >>> Oliver > > > >>> > > > >>> ------------------------------------------------------------ > > --------- > > > >>> To unsubscribe, e-mail: [email protected] > > > >>> For additional commands, e-mail: [email protected] > > > >>> > > > >>> > > > >> > > > > > > > > > > > > > > > > > > --------------------------------------------------------------------- > > > To unsubscribe, e-mail: [email protected] > > > For additional commands, e-mail: [email protected] > > > > > > > > > > > > -- > Matt Sicker <[email protected]> > -- E-Mail: [email protected] | [email protected] Java Persistence with Hibernate, Second Edition <http://www.manning.com/bauer3/> JUnit in Action, Second Edition <http://www.manning.com/tahchiev/> Spring Batch in Action <http://www.manning.com/templier/> Blog: http://garygregory.wordpress.com Home: http://garygregory.com/ Tweet! http://twitter.com/GaryGregory
