Login | Register
My pages Projects Community openCollabNet

Discussions > issues > [Issue 1386] New - 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] New - The merge process seems somewhat counterintuitive (seems to hang) when using the graphical editor to resolve a conflict

Author davidecavestro
Full name Davide Cavestro
Date 2012-03-14 06:43:17 PDT
Message http://subclipse.tig​ris.org/issues/show_​bug.cgi?id=1386
                 Issue #|1386
                 Summary|The merge process seems somewhat counterintuitive (see
                        |ms to hang) when using the graphical editor to resolve
                        | a conflict
               Component|subclipse
                 Version|current
                Platform|All
              OS/Version|Linux
                     URL|
                  Status|NEW
       Status whiteboard|
                Keywords|
              Resolution|
              Issue type|ENHANCEMENT
                Priority|P3
            Subcomponent|UI
             Assigned to|issues@subclipse
             Reported by|davidecavestro






------- Additional comments from davidecavestro at tigris dot org Wed Mar 14 06:43:17 -0700 2012 -------
Do a "Team|Merge" that causes conflicts on a text file and choose to prompt the
user for every conflict. Then choose to use the graphical conflict resolution
editor to resolve the conflict.
So you have the "merge in progress" dialog (at this point it could automatically
go in background) and the graphical conflict resolution editor.
You adapt incoming changes/conflicts and save them from the graphical conflict
resolution editor.
What seems strange to me is that you have to close the graphical conflict
resolution editor to see a dialog for conflict resolution where you can say if
and how you have resolved the conflict or not. Then the merge process
continues/ends.

If you don't understand to close the editor, you will stand still forever.

I don't know if there are other/better ways to resolve conflicts using the
graphical conflict resolution editor (I've not found them on the FAQ), but maybe
even an additional button on the graphical conflict resolution editor toolbar
could do the trick, simply triggering the "Resolve Conflict" dialog.

I dare to mark this issue as an enhancement cause it's mainly related to usability.

« Previous message in topic | 1 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: