Login | Register
My pages Projects Community openCollabNet

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

subclipse
Discussion topic

Back to topic list

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

Author selsemore
Full name Stephen Elsemore
Date 2011-10-03 14:36:20 PDT
Message 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 dot org" <jacobweber at tigris dot org> wrote:

> http://subclipse.tig​ris.org/issues/show_​bug.cgi?id=1304
>
>
>
>
>
>
> ------- Additional comments from jacobweber at tigris dot 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.tig​ris.org/ds/viewMessa​ge.do?dsForumId=1046​&dsMessageId=284​95
> 12
>
> To unsubscribe from this discussion, e-mail:
> [issues-unsubscribe@​subclipse.tigris.org​].

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

[Subclipse-dev] Re: [Issue 1304] When merging multiple ranges, conflicts can be lost selsemore Stephen Elsemore 2011-10-03 14:36:20 PDT
Messages per page: