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

On 10.09.2012 16:08, Oto BREZINA wrote:

>> When resolving a conflicted file (svn status indicates a conflict), then
>> the flag is passed to TMerge.
>> TMerge then asks to save the changes (even if there were no changes
>> made) to ensure that situations where TMerge can do the merge without a
>> conflict, that merge is saved.
> Sorry for stupid, question I'll try that on Wednesdays soonest, so it is
> easier to ask - until I forgot :)
>
> Thing is there are two ways to save file in T-Merge. 1. Save 2. Mark as
> resolved. I miss the second option in closing dialog when closing
> T-Merge (from conflict resolve mode) sometimes.
>
> Is this what happen now? In source codes I have seen only save what
> usually means save and "resolve later manualy" ...
> From this point it seems to be there some "missconception" but I'll
> know once really tested.

If you save the file before you close TMerge, it does not ask to save
the changes anymore.
So even if you use "mark as resolved" it won't bother you when you close
TMerge.

Only if you try to close TMerge without ever having saved, then it will
ask you to save first.

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=3004801
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].