Re: [TSVN] Re: Couple of issues with Resolve action

From: Will Dean <svn_at_indcomp.co.uk>
Date: 2005-01-03 21:24:10 CET

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")

Will

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Jan 3 21:25:13 2005

This message: [ Message body ]
Next message: allan juul: "[TSVN] tagging to a non-existing path"
Previous message: Joseph Galbraith: "[TSVN] Specifying port number in URLs?"
In reply to: Joseph Galbraith: "[TSVN] Re: Couple of issues with Resolve action"
Next in thread: Erv Walter: "Re: [TSVN] Re: Couple of issues with Resolve action"
Reply: Erv Walter: "Re: [TSVN] Re: Couple of issues with Resolve action"

Contemporary messages sorted: [ By Date ] [ By Thread ] [ By Subject ] [ By Author ] [ By messages with attachments ]