Re: [TSVN] Handling after a merge

Thomas Börkel wrote:

> 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.

Settings dialog. There you'll see an option to automatically resolve a
conflict when saving. Activate that and you're fine.

> 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.

Not possible! "Updated" means that both the file in your working copy
_and_ the file in your working copy base changed identically. There's
nothing to diff there.

> 2. Possibility to resolve the conflict from that dialog.

See comments above about the settings dialog.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org