Mark Phippard wrote:
> Daniel Serodio <daniel.listas@xxx.com.br> wrote on 07/17/2006 05:21:43 PM:
>
>
>> One of our Jr. developers was confused by "Edit conflicts" function,
>> because the Compare Editor that is open when this function is selected
>> shows not only the actual conflicts, but all of the file's
>>
> modifications.
>
>> The documentation for the "Edit conflicts" function says "The Eclipse
>> platform provides a Compare Editor that allows you to review the imbound
>> (sic) and outbound changes in a resource in addition to the lines that
>> are in conflict. It also provides features that allow you to selectively
>> merge the differences between the file variants. "
>>
>> If this is the case, shouldn't this function be labelled "Merge file",
>> "Merge differences" or something similar?
>>
>
> No, the current text is correct. Edit Conflicts option is only applicable
> when you have merged/updated a file and Subversion has produced conflicts
> (the .mine, .left, .right files). Edit Conflicts allows you to manually
> fix the file conflicts. This is the most accurate description, and the
> same one used by TortoiseSVN. The problem is that if you use terms like
> "merge" or "resolve" it is going to confuse things with those subcommands.
>
Hmmmm, what about "Edit conflicted files" then?
TIA,
Daniel Serodio
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Tue Jul 18 16:25:20 2006