SVN 1.5 - Resolve Conflicts (Merging Others' Changes)

Thu Mar 20 18:47:09 CDT 2008

Hi there,
> 
> You haven't attached any patch :) .
Sorry. Of course you're right...i had been to fast with the send button...

But now i have attached the file....i hope so ;-)


Kind regards
Karl Heinz Marbaise
-- 
SoftwareEntwicklung Beratung Schulung    Tel.: +49 (0) 2405 / 415 893
Dipl.Ing.(FH) Karl Heinz Marbaise        ICQ#: 135949029
Hauptstrasse 177                         USt.IdNr: DE191347579
52146 Würselen                           http://www.soebes.de
-------------- next part --------------
A non-text attachment was scrubbed...
Name: conflict.patch
Type: text/x-patch
Size: 2866 bytes
Desc: not available
URL: <http://www.red-bean.com/pipermail/svnbook-dev/attachments/20080321/2d469476/attachment.bin>