Re: resolve conflict dialog is confusing

On 19.10.2011 20:10, spongman wrote:

> I am aware that the target of the merge is the working copy. I'm aware
> that the merge itself does not write anything to the repository. But
> that does not change the fact that the working copy is, nevertheless,
> associated with a repository. It's associated with it before the
> merge, it's associated with it during the merge, and it's associate
> with it after the merge. Just because the repository isn't touched
> during the merge, doesn't mean that association goes away. However,
> what you seem to be saying above, is that in order to make sense of
> the dialog, the user must somehow magically remember to temporarily
> forget about this association.

You don't have to forget about the association. But as was mentioned
several times now, it has nothing to do with the merge.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2858899
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].