[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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

From: Alexander Klenin <klenin_at_gmail.com>
Date: 2007-10-27 13:55:08 CEST

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
Received on Sat Oct 27 13:55:14 2007

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.