When I tried to do it, I saw lot of conflicts especially in dbupgrade file.
On Fri, May 22, 2015 at 13:05 PM, Daan Hoogland <daan.hoogl...@gmail.com> wrote: 4.5 should be merged. no individual commits. Op vr 22 mei 2015 om 06:22 schreef Rajani Karuturi <raj...@apache.org <javascript:;>>: > Are we merging from 4.5 to master or doing individual commits? > > I see that both are being followed. It makes merging very easy if everybody > follows it. > > ~Rajani > -- ~Rajani Sent from my Windows Phone
