I did merge -s ours and somehow didnt see any issue. ( https://github.com/apache/cloudstack/pull/36) will wait for the Travis report ( https://travis-ci.org/apache/cloudstack/builds/40033174)
I havent used -X before. But, from the documentation I understood it as, the merge strategy will be applied only when doing a conflict resolution. If my understanding is right, we shouldnt be using -X. ~Rajani On Mon, Nov 3, 2014 at 3:46 PM, Daan Hoogland <daan.hoogl...@gmail.com> wrote: > Id did do -s ours:) but if we don't merge -s ... -X ours it doesn't help. > > mobile dev with bilingual spelling checker used (read at your own risk) > Op 3 nov. 2014 05:40 schreef "Rajani Karuturi" <raj...@apache.org>: > > > that means, we postponed the git problems to 4.6. :( > > > > It feels like as a community we are running away from making any changes > to > > the way we interact with git. We seem to discuss it a lot but, never act > on > > it. > > > > What I don't understand is, are we saying the way we use git is right? or > > are we just shying away from any change? > > > > > > ~Rajani > > > > PS: We could still do a blank merge(-s ours) from 4.5 to master and > > continue. > > > > On Sat, Nov 1, 2014 at 12:06 AM, David Nalley <da...@gnsa.us> wrote: > > > > > On Fri, Oct 31, 2014 at 12:41 AM, Rajani Karuturi <raj...@apache.org> > > > wrote: > > > > Can we atleast follow the merge part of it? ie) commit to 4.5 and > then > > > > merge 4.5 to master? > > > > > > > > merging wont be easy unless everybody agrees and does merge for their > > > > commits. > > > > > > > > > > It won't work; master and 4.5 have both diverged, even if it's very > > > small at this point. > > > Daan and I both seemed to come to this conclusion last week: > > > > > > http://markmail.org/message/sumgmlo4avgjquym > > > http://markmail.org/message/wazq4lz47v22mynz > > > > > > --David > > > > > >
