SVN 1.5 - Resolve Conflicts (Merging Others' Changes)

Karl Heinz Marbaise khmarbaise at gmx.de
Thu Mar 20 18:38:46 CDT 2008


Hi,

sorry i have missed the reference chapter...patch attachted for both
chapters...

Now it will change the reference chapter and chapter basic usage.


My Log-Message entry for this patch:

* src/en/book/ch02-basic-usage.xml
  - updated output of interactive conflict resolution
* src/en/book/ch09-reference.xml
  - updated valid values for the accept option.


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




More information about the svnbook-dev mailing list