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

Re: Stopping Merge on Conflict

From: Fernando P. Nájera Cano <tortoisesvn_at_fernandonajera.com>
Date: 2006-09-29 00:03:21 CEST


CT> I'm not sure if this is a svn issue or a tortoisesvn issue, but is there a
CT> way to stop the automatic attempt at merging when there's a changed-out of
CT> date conflict?

It is a SVN issue.

From Sep. 19:

> The stock answer seems to be:
> Settings -> Subversion configuration file -> click the edit button
> Change the [helpers] section by adding:-
> diff3-cmd = "C:\false.bat"
> Creating a C:\false.bat which contains only the following line:-
> exit 1

Best regards,

Fernando Nájera

To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Fri Sep 29 00:03:46 2006

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

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