Re: Betr.: Re: Betr.: Re: Betr.: how to avoid text and tree conflict

2011-04-05 Thread Johan Corveleyn
On Tue, Apr 5, 2011 at 6:39 PM, su heng wrote: > On Tue, 2011-04-05 at 09:16 +0200, Jan Keirse wrote: >> > Hi Jan, >> > >> >   I just try the example which you provided to me. Please refer to >> my >> > flow: >> > ### >> > step 1 >> > submit one file possat: >> > -- >> > br

Re: Betr.: Re: Betr.: Re: Betr.: how to avoid text and tree conflict

2011-04-05 Thread su heng
On Tue, 2011-04-05 at 09:16 +0200, Jan Keirse wrote: > > Hi Jan, > > > > I just try the example which you provided to me. Please refer to > my > > flow: > > ### > > step 1 > > submit one file possat: > > -- > > brand=vw > > model=possat > > tires=4 > > engine=1900 > > ho

Re: Betr.: Re: Betr.: how to avoid text and tree conflict

2011-04-04 Thread su heng
On Mon, 2011-04-04 at 17:37 +0200, Jan Keirse wrote: > su heng schreef op 04/04/2011 16:31:17: > > > Hi Jan, > > > > Please kindly refer to my below comments. > > > > Regards, > > Su Heng > > > > On Mon, 2011-04-04 at 16:03 +0200, Jan Keirse wrote: > > > su heng schreef op 04/04/2011 15:41:

Betr.: Re: Betr.: how to avoid text and tree conflict

2011-04-04 Thread Jan Keirse
su heng schreef op 04/04/2011 16:31:17: > Hi Jan, > > Please kindly refer to my below comments. > > Regards, > Su Heng > > On Mon, 2011-04-04 at 16:03 +0200, Jan Keirse wrote: > > su heng schreef op 04/04/2011 15:41:38: > > > > > Hi, > > > > > > I read the SVN book, as there are three t

Re: Betr.: how to avoid text and tree conflict

2011-04-04 Thread su heng
Hi Jan, Please kindly refer to my below comments. Regards, Su Heng On Mon, 2011-04-04 at 16:03 +0200, Jan Keirse wrote: > su heng schreef op 04/04/2011 15:41:38: > > > Hi, > > > > I read the SVN book, as there are three type conflicts: text, tree and > > properties conflict. However, I wa

Betr.: how to avoid text and tree conflict

2011-04-04 Thread Jan Keirse
su heng schreef op 04/04/2011 15:41:38: > Hi, > > I read the SVN book, as there are three type conflicts: text, tree and > properties conflict. However, I wanna know why it is a conflict. For > example, if there is a text conflict when I do merging code, I just know > there is an conflict but