<div dir="ltr">Actually, I think this usage is correct.  "whole.c" only appears in the *right* side of the merge (because it was renamed from the "integer.c" found in the left side).</div><div class="gmail_extra"><br><div class="gmail_quote">On Sat, Nov 11, 2017 at 8:49 PM, wuzhouhui <span dir="ltr"><<a href="mailto:wuzhouhui250@gmail.com" target="_blank">wuzhouhui250@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><span style="font-family:monospace,monospace">Hi, Mike<br><br>I found another wrong filename in chapter 4. According to the example<br>proposed, the file should be whole.c, instead of integer.c.<br><br></span><div class="gmail_default"><span style="font-family:monospace,monospace">​​Index: book/ch04-branching-and-<wbr>merging.xml<br>==============================<wbr>==============================<wbr>=======<br>diff --git a/trunk/en/book/ch04-<wbr>branching-and-merging.xml b/trunk/en/book/ch04-<wbr>branching-and-merging.xml<br>--- a/trunk/en/book/ch04-<wbr>branching-and-merging.xml    (revision 5488)<br>+++ b/trunk/en/book/ch04-<wbr>branching-and-merging.xml    (working copy)<br>@@ -3149,7 +3149,7 @@ Summary of conflicts:<br>         combine those changes, but rather raises a tree conflict<footnote><br>         <para>If Sally hadn't made her change in r472, then Subversion would<br>         notice that <filename>integer.c</filename> in the<br>-        target working copy is identical to <filename>integer.c</filename><br>+        target working copy is identical to <filename>whole.c</filename><br>         in the left-side of the merge and would allow your rename to<br>         succeed without a tree conflict:</para><br>         <informalexample><br><br></span></div></div>
<br>______________________________<wbr>_________________<br>
svnbook-dev mailing list<br>
<a href="mailto:svnbook-dev@red-bean.com">svnbook-dev@red-bean.com</a><br>
<a href="http://www.red-bean.com/mailman/listinfo/svnbook-dev" rel="noreferrer" target="_blank">http://www.red-bean.com/<wbr>mailman/listinfo/svnbook-dev</a><br></blockquote></div><br></div>