Re: Intermittent failure to merge changes into working copy when doing updates

Elliot,

> I can confirm we are getting the same problem. It does appear to be related
> to any file that is concurrently modified quite often; changes from the

Are you sure you do not have the file open in any editor during the
update? That could cause the merge to be overwritten once you save the
file again in your editor...

--
Regards,
Jean-Marc
----------------
    ___
   // \\  @@     "De Chelonian Mobile"
  / \_/ \/._)    TortoiseSVN
 <\_/_\_/ /      The coolest Interface to (Sub)Version Control
  /_/   \_\      Check out http://tortoisesvn.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org