[TSVN] Re: Couple of issues with Resolve action

Mark Phippard <MarkP <at> softlanding.com> writes:

> 2) I am working on a long lived branch and do frequent merges from trunk.
> I love that I can double-click on conflicts and launch TMerge. It would
> be equally wonderful if somehow you could mark the conflict resolved from
> within TMerge, when exiting TMerge, or perhaps a right-click option on the
> main merge confirmation dialog that I used to launch TMerge.

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.

Thanks,

Joseph

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Jan 3 19:45:24 2005