[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Aw: Merge Wizard - Feature Request

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-11-09 19:49:50 CET

tmto@arcor.de wrote:

> If there is a conflict on the merge the dialog "Resolve conflict"
> appears. For the option "Choose item:" there are two buttons "Use
> local" and "Use repository". That`s quite fine. But when I have to
> merge branches I don`t know which is the right version without have a
> look into the files. So I would like to have another button "Diff" to

Not sure what you mean here. No matter what you merge, there's always
the *local* file (the one where you merge to, your target working copy)
and the *repository* file. When you merge two urls, the repository file
is already a merged one (merged with the changes from your two urls).

That conflict resolution dialog only gives you the option of using
either your local file, or the one that would get applied if your local
file didn't have any modifications already (those local modifications
could be because *you* modified it, or because the merge you're doing
already merged some parts into it).

Or you can manually resolve the conflict, then save the resolved file in
TortoiseMerge and click on "resolved".
btw: you can click on "Edit Conflict" and later still choose "local" or
"repository" file if you like. That's up to you.

> Ok it`s possible to click the button "Edit conflict" but the Diff
> tool then starts already in the merge mode and not in the diff mode.

The merge mode is necessary because there is a conflict.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Nov 9 19:50:32 2007

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.