Re: [tortoisesvn] r23303 committed - After saving the file, ask whether to mark the file as resolved. But o...

On 2012-09-20 19:54, tortoisesvn_at_googlecode.com wrote:
> Revision: 23303
>
> Log: After saving the file, ask whether to mark the file as resolved.
> But only if the file is versioned and its status is 'conflicted'.
> http://code.google.com/p/tortoisesvn/source/detail?r=23303
Thanks for this!

I tested that and works quite good.

There are two dialogs when closing T-Merge on conflict and you select
Save on first one. This is good, but i expected to have just one with
Resolve in first. This is acceptable even I have to choose Save in first
one ...

The issue is when you click "Mark as resolved" you are asked again if
you want to "mark as resolved". It seem when resolve is used Save is
performed and it display "mark as resolve?" dialog.

-- 
Oto ot(ik) BREZINA - 오토
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3009996
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].