Re: svn commit: r11136 - trunk/doc: . images/en source/en/TortoiseSVN/tsvn_dug test

On 27/10/2007, Alexander Klenin <klenin@gmail.com> wrote:
> On 26 Oct 2007 22:52:15 -0000, simonlarge@tigris.org
> <simonlarge@tigris.org> wrote:
> > + During merging, particularly with multiple ranges, it may be
> > + that conflicts occur which prevent the merge from continuing.
> Sounds too complicated, especially "it may be that conflicts occur".
> Perhaps simply "Merging may be interrupted by a conflict" ?

OK, will review.

> > + repository and keep your local version. Or you discard
> > + consider your local changes in favour of the repository
> > + version. Either way, no attempt is made to merge the
> This sentence does not make sense to me.

Nor me :-( I will try again later.

Simon

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org