vsn merge: default to postpone

[Mathieu Malaterre <ma...@gmail.com>]

Hi there,

  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



Thanks
-- 
Mathieu

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: vsn merge: default to postpone

[Mark Phippard <ma...@gmail.com>]

On Thu, Sep 25, 2008 at 5:01 PM, Mathieu Malaterre
<ma...@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
file."

-- 
Thanks

Mark Phippard
http://markphip.blogspot.com/

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org