Wait, that's not all. Once you click on a conflicted file you will be given
the options to:
1. Edit conflicts (using the usual tools)
2. Resolve conflicts
3. Use update copy (in effect: delete and reUpdate).
I find it the most convenient to deal with problems in a concentrated
fashion. These suggestions would let me deal effectively with the two types
of conflicts: Text (via the edit and resolve) and Binary (via the 'use
updated copy').
If a file or directory or something should have been erased by the update
but were not (because they were updated since the previous update) allow me
to
4. Delete
5. Move
6. Rename.
Finally, it would be very useful to have an Open Containing Workspace
(Folder) option that will allow me to directly reach the affected files.
Amir Kolsky
XP& Software
Received on Thu Apr 14 07:53:42 2005