as, with 4 tires,
> delete the file if you want, but fix the somesiat branch and merge
> from the somesiat branch to the Octevia branch.
>
>
> Kind Regards,
>
> JAN KEIRSE
> DISCLAIMER
>
> http://www.tvh.com/newen2/emaildisclaimer/default.html
>
> "This message is delivered to all addressees subject to the conditions
> set forth in the attached disclaimer, which is an integral part of
> this
> message."
Hi Jan & Bob,
Got it, so If we merge different changes(on one or more same lines)
under same file, we will encounter the conflict and it is the basic and
only rule of text conflict, right?
^_^ Thank you very much.
--
Regards,
Su Heng
MSN: suh.ste...@hotmail.com
e, I can avoid more
> > conflict when I'm coding or merging. I concert the text and tree
> > conflict more.
> >
> > Regards,
> > Su Heng
> >
> > --
> > QQ :49757862
> > MSN:suh.ste...@hotmail.com
> > Mobile: (0512)60780554
> >
>
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 Ke
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
> > p
uld u provide me some resource or hints what are the judge rules
for SVN to address it is a conflict, in this case, I can avoid more
conflict when I'm coding or merging. I concert the text and tree
conflict more.
Regards,
Su Heng
--
QQ :49757862
MSN:suh.ste...@hotmail.com
Mobile: (0512)60780554
