Login | Register
My pages Projects Community openCollabNet

Discussions > issues > [Issue 1386] The merge process seems somewhat counterintuitive (seems to hang) when using the graphical editor to resolve a conflict

subclipse
Discussion topic

There will be a brief maintenance window every Friday at 17:00 Pacific.
For further details, see CollabNet's maintenance and upgrade policy.

Back to topic list

[Issue 1386] The merge process seems somewhat counterintuitive (seems to hang) when using the graphical editor to resolve a conflict

Author markphip
Full name Mark Phippard
Date 2012-03-14 07:50:19 PDT
Message http://subclipse.tig​ris.org/issues/show_​bug.cgi?id=1386






------- Additional comments from markphip at tigris dot org Wed Mar 14 07:50:17 -0700 2012 -------
The editor is not our tool so we cannot add UI to it and you need to close the editor so that we know you
are done. You are given options after closing the editor because it is impossible to know what you have
done. I have opened an editor before and realized I just wanted all the changes from one version of the
file so I just close it and choose that option, I have also had plenty of times that I have opened the editor,
seen that there were more conflicts then I wanted to deal with at the moment and so used the dialog to
indicate I would come back to it later.

I do not see anything here that can or should be changed.

« Previous message in topic | 2 of 3 | Next message in topic »

Messages

Show all messages in topic

Subject
Author
Full name
Date posted
+
[Issue 1386] New - The merge process seems somewhat counterintuitive (seems to hang) when using the graphical editor to resolve a conflict davidecavestro Davide Cavestro 2012-03-14 06:43:17 PDT
     [Issue 1386] The merge process seems somewhat counterintuitive (seems to hang) when using the graphical editor to resolve a conflict markphip Mark Phippard 2012-03-14 07:50:19 PDT
     [Issue 1386] The merge process seems somewhat counterintuitive (seems to hang) when using the graphical editor to resolve a conflict davidecavestro Davide Cavestro 2012-03-15 00:57:52 PDT
Messages per page: