Hi Reka, If it's get conflict only the same class same location get edited by two or more users. Since we have git merge tool I think we can easily fix the conflict issues if they occurs.
Thanks ! On Thu, Jun 26, 2014 at 3:33 PM, Reka Thirunavukkarasu <r...@wso2.com> wrote: > Hi > > On Thu, Jun 26, 2014 at 2:39 PM, Isuru Haththotuwa <isu...@apache.org> > wrote: > >> AFAIR it was decided earlier to use the master branch for this feature, >> in the thread [1]. Creating a separate branch is fine, however will have to >> put a considerable effort when merging back to the master branch, since >> this change spans through many places in the code base. However, as this is >> a standard development practice, +1 for it. >> > > Thanks Isuru for pointing it out. Since it is major development and it has > to go through several experimental cycles to make it stabilize. If we block > the master because of this feature, then no others can try anything with > master. That's why thought of putting it into a separate branch. Anyway i > agree that required considerable effort to merge it back to master. > > Thanks, > Reka > >> >> [1]. [Discuss] Grouping of services (cartridges) >> >> >> On Thu, Jun 26, 2014 at 11:43 AM, Reka Thirunavukkarasu <r...@wso2.com> >> wrote: >> >>> Thank you all for the responses. >>> >>> @Martin, Could you create the branch and incorporate your changes to the >>> branch as you have already started working on this? After you sync up with >>> the branch, others can also to start on work on that branch. Can we start >>> another thread with the status of this feature? So that it may help others >>> to follow it up.. >>> >>> Thanks, >>> Reka >>> >>> >>> >>> On Thu, Jun 26, 2014 at 11:03 AM, Maria Beckham < >>> mariabeckha...@yahoo.com> wrote: >>> >>>> thanks Dakshika >>>> >>>> ------------------------------ >>>> *From:* Dakshika Jayathilaka <daksh...@wso2.com> >>>> *To:* dev <dev@stratos.apache.org> >>>> *Cc:* Maria Beckham <mariabeckha...@yahoo.com> >>>> *Sent:* Wednesday, June 25, 2014 10:30 PM >>>> *Subject:* Re: Separate Branch to work on Cartridge Grouping feature >>>> >>>> +1 >>>> >>>> @maria: check this: >>>> https://www.mail-archive.com/dev@stratos.incubator.apache.org/msg06300.html >>>> >>>> *Dakshika Jayathilaka* >>>> Software Engineer >>>> WSO2, Inc. >>>> lean.enterprise.middleware >>>> 0771100911 >>>> >>>> >>>> >>>> >>>> On Thu, Jun 26, 2014 at 5:19 AM, Reka Thirunavukkarasu <r...@wso2.com> >>>> wrote: >>>> >>>> Hi Maria, >>>> >>>> >>>> On Thu, Jun 26, 2014 at 10:40 AM, Maria Beckham < >>>> mariabeckha...@yahoo.com> wrote: >>>> >>>> What do you mean by cartridge grouping feature? >>>> >>>> >>>> Could you please refer to "[Discuss] Grouping of services (cartridges)" >>>> mail? It was sent to d...@stratos.incubator.apache.org. In simple >>>> terms, cartridge grouping is to connect cartridges and apply scaling or any >>>> decision to a set of cartridges (cartridge group). It will eventually >>>> provide the CAMP support in Aapche stratos. >>>> >>>> Thanks, >>>> Reka >>>> >>>> >>>> ------------------------------ >>>> *From:* Reka Thirunavukkarasu <r...@wso2.com> >>>> *To:* dev <dev@stratos.apache.org> >>>> *Cc:* Lakmal Warusawithana <lak...@wso2.com>; Martin Eppel (meppel) < >>>> mep...@cisco.com> >>>> *Sent:* Wednesday, June 25, 2014 10:02 PM >>>> *Subject:* Separate Branch to work on Cartridge Grouping feature >>>> >>>> Hi all, >>>> >>>> Can we create $subject as we are kind of doing major changes on >>>> Cartridge Grouping feature? Please refer "[Discuss] Grouping of >>>> services (cartridges)" in the mail for more information on this >>>> feature. >>>> >>>> We can actively work on this feature in a separate branch until we >>>> bring it up to a stabilize state and then we can merge the changes back to >>>> master? WDYT? >>>> >>>> Please share you thoughts on this... >>>> >>>> Thanks, >>>> Reka >>>> >>>> -- >>>> Reka Thirunavukkarasu >>>> Senior Software Engineer, >>>> WSO2, Inc.:http://wso2.com, >>>> Mobile: +94776442007 >>>> >>>> >>>> >>>> >>>> >>>> >>>> >>>> -- >>>> Reka Thirunavukkarasu >>>> Senior Software Engineer, >>>> WSO2, Inc.:http://wso2.com, >>>> Mobile: +94776442007 >>>> >>>> >>>> >>>> >>>> >>>> >>> >>> >>> -- >>> Reka Thirunavukkarasu >>> Senior Software Engineer, >>> WSO2, Inc.:http://wso2.com, >>> Mobile: +94776442007 >>> >>> >>> >> > > > -- > Reka Thirunavukkarasu > Senior Software Engineer, > WSO2, Inc.:http://wso2.com, > Mobile: +94776442007 > > > -- Regards, Manula Chathurika Thantriwatte Software Engineer WSO2 Inc. : http://wso2.com lean . enterprise . middleware email : manu...@wso2.com / man...@apache.org phone : +94 772492511 blog : http://manulachathurika.blogspot.com/
