Description Samuel Wu 2010-11-22 09:48:58 EST

Build Identifier: RSE 3.2.1

The current defaut selection of the Save Conflict dialog is Replace contents of editor with remote file which causes the pending change made in editor lost. The default selection should be Save the contents of the editor to a different remote file which allows the user to keep the change made.

Reproducible: Always

Steps to Reproduce:
1. Open a file in a editor through RSE system view
2. Open the same file through another editor outside Eclipse and make a change to it.
3. Go back to eclipse editor and make another change
4. When saving the file, you will get a Save Conflict dialog 
5. The radio button Replace contents of editor with remote file is selected by default.
6. Some of the users hit the Enter button too soon and lose the changes made in the editor.
Since content conflict is a situation which needs more attention, the default selection of the dialog should be Save the contents of the editor to a different remote file and the OK button should be disabled. In this way the user can save the local change,compare it with the remote one and merge the change.