[TSVN] Handling after a merge

HI!

After a merge, I get a merge dialog, where I can see, what has been updated and what was conflicted.

When I double-click on a conflicted file, I get the conflict editor. After solving the conflict, I still have to go to the Windows Explorer and choose "Resolved" on the conflicted files.

If I want to see, what the merge has changed on the non-conflicted files (diff), I also have to go to the Windows Explorer.

I'd like to suggest the following productivity enhancements for the after-merge-dialog:

1.
Double-click on a non-conflicted ("updated") file should show the visual diff.

2.
Possibility to resolve the conflict from that dialog.

3.
Possibility to jump to the file in the Windows Explorer from that dialog (not that important, if 1. and 2. would be implemented).

Thanks!

Thomas

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Nov 2 10:47:21 2004