Stephen Elsemore
2011-10-03 21:36:43 UTC
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).
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1043&dsMessageId=2849515
To unsubscribe from this discussion, e-mail: [dev-***@subclipse.tigris.org].
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).
http://subclipse.tigris.org/issues/show_bug.cgi?id=1304
-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
-------------------------------------------------------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
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1043&dsMessageId=2849515
To unsubscribe from this discussion, e-mail: [dev-***@subclipse.tigris.org].