Community
Participate
Working Groups
20011206 Make sure a large class, that is used in many places, has conflicts. (in my case, it was SWT's Control class) Now Synchronize. Copy most of the incoming changes from right to left (keep your conflict). Now, in the left pane, pop up the context menu and click "Save". There is no hourglass, so for a while, you wonder what is happening. Maybe a progress dialog would even be appropriate.
*** This bug has been marked as a duplicate of 2396 ***