<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<HTML><HEAD>
<META http-equiv=Content-Type content="text/html; charset=us-ascii">
<META content="MSHTML 6.00.2900.3132" name=GENERATOR></HEAD>
<BODY>
<DIV dir=ltr align=left><FONT face=Arial color=#0000ff size=2><SPAN
class=890514419-14082007>also the books main page still contains a link to the
old svk-dev page and address.</SPAN></FONT></DIV><FONT face=Arial color=#0000ff
size=2></FONT><BR>
<DIV class=OutlookMessageHeader lang=en-us dir=ltr align=left>
<HR tabIndex=-1>
<FONT face=Tahoma size=2><B>From:</B> Stillwell, Jason <BR><B>Sent:</B> Tuesday,
August 14, 2007 12:36 PM<BR><B>To:</B>
'svk-dev@lists.openfoundry.org'<BR><B>Subject:</B> book
error<BR></FONT><BR></DIV>
<DIV></DIV>
<DIV><A
href="http://svkbook.elixus.org/nightly/en/svk.branchmerge.copychanges.html#svk.branchmerge.copychanges.bestprac.merge"><FONT
face=Arial
size=2>http://svkbook.elixus.org/nightly/en/svk.branchmerge.copychanges.html#svk.branchmerge.copychanges.bestprac.merge</FONT></A><FONT
face=Arial><FONT size=2> </FONT></FONT></DIV>
<DIV><FONT face=Arial><FONT size=2></FONT></FONT> </DIV>
<DIV><FONT size=+0><FONT face=Arial><FONT size=2><SPAN
class=093053319-14082007>has </SPAN></FONT></FONT></FONT></DIV>
<DIV><FONT size=+0><FONT face=Arial><FONT size=2><SPAN
class=093053319-14082007></SPAN></FONT></FONT></FONT> </DIV>
<DIV><FONT size=+0><FONT face=Arial><FONT size=2><SPAN
class=093053319-14082007>"<FONT face="Times New Roman" size=3> In </FONT><A
title="Resolve Conflicts (Merging Others' Changes)"
href="http://svkbook.elixus.org/nightly/en/svk.tour.cycle.html#svk.tour.cycle.resolve"><FONT
face="Times New Roman" size=3>the section called “Resolve Conflicts (Merging
Others' Changes)”</FONT></A><FONT size=3><FONT face="Times New Roman">, we saw
that an update produces files named </FONT><CODE
class=filename>filename.mine</CODE><FONT face="Times New Roman">, </FONT><CODE
class=filename>filename.rOLDREV</CODE><FONT face="Times New Roman">, and
</FONT><CODE class=filename>filename.rNEWREV</CODE><FONT
face="Times New Roman">. "</FONT></FONT></SPAN></FONT></FONT></FONT></DIV>
<DIV><FONT size=+0><FONT face=Arial><FONT face="Times New Roman" size=3><SPAN
class=093053319-14082007></SPAN></FONT></FONT></FONT> </DIV>
<DIV><FONT size=+0><FONT size=+0><FONT face=Arial size=2><SPAN
class=093053319-14082007>but the linked section (<A
href="http://svkbook.elixus.org/nightly/en/svk.tour.cycle.html#svk.tour.cycle.resolve">http://svkbook.elixus.org/nightly/en/svk.tour.cycle.html#svk.tour.cycle.resolve</A>) contains
no mention of these extra files created during conflict
resolution.</SPAN></FONT></FONT></FONT></DIV>
<DIV><FONT size=+0><FONT size=+0><FONT face=Arial size=2><SPAN
class=093053319-14082007></SPAN></FONT></FONT></FONT> </DIV>
<DIV><FONT size=+0><FONT size=+0><FONT face=Arial size=2><SPAN
class=093053319-14082007><FONT face="Times New Roman"
size=3></FONT></SPAN></FONT></FONT></FONT> </DIV></BODY></HTML>