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

Re: [RFC] - New option to resolve conflicts on merge/resolved commands

From: Mark Phippard <markphip_at_gmail.com>
Date: 2007-05-23 14:38:10 CEST

On 5/23/07, Eric Gillespie <epg@pretzelnet.org> wrote:
> "Jared Hardy" <jaredhardy@gmail.com> writes:
> > SVK gives a similar option on any update -- it interactively asks
> > you whether to use "mine", "theirs", "spawn default merge app now", or
> > "save revision-numbered file for merge later" (I'm paraphrasing of
> Well, i don't know about those other two options, but i've always
> wanted this --accept option on all commands that might merge
> (checkout/update/switch/merge i think?).

OK, entered issue.


Mark Phippard
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed May 23 14:38:31 2007

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