Re: [TSVN] Merging from deleted branch to trunk

Will Dean wrote:
> I just tried a 'dry run' of a merge into 1.1.3 (which I had neglected to
> update first), and it gave me some conflicts. 'Fine' I thought - must
> remember to update first.
>
> Until I discovered that the conflicts had *actually* occurred in the WC
> - so the run wasn't as dry as I'd hoped...

*gulp*
Ok, I'll use the command line for merging until that's fixed (or you
admit to user error from your part) if you don't mind. :(

Regards,

Roel Harbers

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Jan 19 18:08:33 2005