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

[Subclipse-dev] Re: [Issue 1304] When merging multiple ranges, conflicts can be lost

From: Stephen Elsemore <selsemore_at_collab.net>
Date: Mon, 03 Oct 2011 14:36:43 -0700

No, I've tried it both way, "prompt" and "resolve later". In either case,
the merge aborts, as I would expect it to, after merging a revision range
that results in conflicts (I get the same behavior using command line).

On 10/3/11 2:27 PM, "jacobweber_at_tigris.org" <jacobweber_at_tigris.org> wrote:

> http://subclipse.tigris.org/issues/show_bug.cgi?id=1304
>
>
>
>
>
>
> ------- Additional comments from jacobweber_at_tigris.org Mon Oct 3 14:27:01
> -0700 2011 -------
> It sounds like you have Conflict Handling set to "Prompt me for each
> conflict". I have it set to "Mark
> conflicts, let me resolve them later." That probably explains the difference.
>
> ------------------------------------------------------
> http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1046&dsMessageId=28495
> 12
>
> To unsubscribe from this discussion, e-mail:
> [issues-unsubscribe_at_subclipse.tigris.org].

------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1043&dsMessageId=2849515

To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_subclipse.tigris.org].
Received on 2011-10-03 23:36:23 CEST

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