not sure daan. Check the branch merge-45-to-master[1] for the conflicts If we agree to only do merge from 4.5, then its worth resolving. Otherwise, its a waste of time for the one who does the merge, with folks doing high density individual commits.
[1] https://github.com/apache/cloudstack/compare/merge-45-to-master?expand=1 ~Rajani On Fri, May 22, 2015 at 4:49 PM, Daan Hoogland <daan.hoogl...@gmail.com> wrote: > that must have been a while ago, was it? after 4.5 I did a merge with only > minor problems. > > Op vr 22 mei 2015 om 12:33 schreef Rajani Karuturi <raj...@apache.org>: > > > 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 > > >
