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

Re: vsn merge: default to postpone

From: Mark Phippard <markphip_at_gmail.com>
Date: Thu, 25 Sep 2008 17:13:23 -0400

On Thu, Sep 25, 2008 at 5:01 PM, Mathieu Malaterre
<mathieu.malaterre_at_gmail.com> wrote:

> I was doing a svn merge, which was taking some time, so I decided to
> go away. When I got back it was stuck on :
> Conflict discovered in 'CMakeLists.txt'.
> Select: (p) postpone, (df) diff-full, (e) edit,
> (h) help for more options: p
> I cannot find how I can specify to always postpone.
> Using
> $ svn --version
> svn, version 1.5.1 (r32289)
> compiled Jul 24 2008, 20:58:29

See: http://subversion.tigris.org/svn_1.5_releasenotes.html#interactive-conflict-resolution

"This feature can be selectively disabled by using the
--non-interactive option, or disabled permanently by setting
'[miscellany] interactive-conflicts = no' in your run-time config

Mark Phippard
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-09-25 23:13:51 CEST

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

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