Will Dean <svn@indcomp.co.uk> wrote:
> At 18:37 03/01/2005 +0000, you wrote:
>
>> I'm in the same circumstances, and would love to see this as
>> well-- my tree is quite deep and having surf around and find
>> the conflicted files is a pain, especially since there is a
>> list of them right in front of me if only I could use it.
>
> TMerge. View -> Settings -> General Tab
> Then check - "Resolve conflicted subversion status on save"
>
> (Which would probably be clearer if it said something more like
> "Resolve Subversion 'Conflicted' status when saving")
>
It would still be helpful if you could resolve from the dialog that spawned
the merge. I use a 3rd party merge app (not TMerge), so I don't have the
option of the TMerge setting. Currently, I have to go find the file itself
and right click it.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Jan 4 00:07:56 2005