[Issue 1019] New - Merge Option

[Claudio Schmid]

http://subclipse.tigris.org/issues/show_bug.cgi?id=1019
                 Issue #|1019
                 Summary|Merge Option
               Component|subclipse
                 Version|1.4.x
                Platform|JavaHL
              OS/Version|Windows XP
                     URL|
                  Status|NEW
       Status whiteboard|
                Keywords|
              Resolution|
              Issue type|ENHANCEMENT
                Priority|P3
            Subcomponent|UI
             Assigned to|issues@subclipse
             Reported by|cschmid






------- Additional comments from cschmid@... Thu Oct 22 14:59:13 -0700 2009 -------
Some times when I did "Update" action, a merge operation was performed. I want
to configure my client if it possible in order to generate a conflict always
instead of a merge, because not always a merge operation return the result file
needed.

Is there any way to configure it? This configuration need to be done on the
client or on the server?

Thanks in advance for your help
Claudio

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

To unsubscribe from this discussion, e-mail: [issues-unsubscribe@...].

[Mark Phippard-3]

http://subclipse.tigris.org/issues/show_bug.cgi?id=1019






------- Additional comments from markphip@... Mon Oct 26 07:54:03 -0700 2009 -------
I have never tried it but this should work:

http://tortoisesvn.net/node/241

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

To unsubscribe from this discussion, e-mail: [issues-unsubscribe@...].