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

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" ?

> + 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.

-- 
Alexander S. Klenin
Insight Experts Ltd.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org