Re: [TSVN] Re: Re: TortoiseMerge bug & feature request

Simon Large wrote:

>>"Check For Updates" comes to mind.
>
> Tried that. I did an Update which gave me the conflict in the first place.
> If I do a check-for-updates after that, there are no more updates so I just
> get an empty box. My WC is right up-to-date, but it has a conflict which I
> have not resolved yet.

An empty box? You did a "check for updates" and not an "upated" right?

Stefan

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sat Sep 11 20:14:08 2004