Re: [tortoisesvn] r23280 committed - When resolving a conflict, make TMerge ask for saving modifications on...

On 18.09.2012 21:04, Oto BREZINA wrote:

> But...
>
> Just I had case when update result in conflict. There were new line
> style changes only so there is no conflict shown in T-Merge. When I
> closed T-Merge question Save | Exit | Cancel apeared. I used Save,
> because I wanted to save resolved version. That happen and disk I have
> resolved version of file (without "<<<<<<< .mine"), however file state
> is still "conflicted".
>
> My suggestion remains: Resolve option. As for rare case Save can be used
> as well it can be kept, but Resolve is what I would expect here.

Sure the state remains conflicted: Only if you use the "resolved"
command, then the state changes to resolved.

TMerge can not mark a file as resolved, because it has no knowledge
about working copies.

Stefan

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