<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></head><body dir="auto"><div></div><div>On Jan 11, 2018, at 6:41 PM, wuzhouhui <<a href="mailto:wuzhouhui14@mails.ucas.ac.cn">wuzhouhui14@mails.ucas.ac.cn</a>> wrote:</div><div><br></div><blockquote type="cite"><div>+1. Suppose file a.c has local change:<br>
@@ -0,0 +1 @@ <br>
+a.c <br>
and change received also has same change. So these two changes are "overlap", but not <br>
"conflict". a.c will be marked "G" when update. <br>
<blockquote name="replyContent" class="ReferenceQuote" style="padding-left:5px;margin-left:5px;border-left:#b6b6b6 2px solid;margin-right:0;">
-----原始邮件-----<br>
<b>发件人:</b><span id="rc_from">"Richard Cavell" <<a href="mailto:richardcavell@mail.com">richardcavell@mail.com</a>></span><br>
<b>发送时间:</b><span id="rc_senttime">2018-01-12 06:54:31 (星期五)</span><br>
<b>收件人:</b> <a href="mailto:svnbook-dev@red-bean.com">svnbook-dev@red-bean.com</a><br>
<b>抄送:</b> <br>
<b>主题:</b> Re: Suggestion for Chapter 2 rewording<br>
<br>
<div style="font-family:Verdana;font-size:12.0px;">
<div>
<div>
Sorry. Now that I'm looking at it more closely, I realize that I didn't understand what was being said. But now I think that the word "conflict" would be better than "overlap".
</div>
<div>
</div>
<div>
Here's a patch with that change. What do you think?
</div>
<div>
</div>
<div>
Richard
</div>
<div>
<div name="quote" style="margin:10px 5px 5px 10px;padding:10px 0 10px 10px;border-left:2px solid #C3D9E5;word-wrap:break-word;-webkit-nbsp-mode:space;-webkit-line-break:after-white-space;">
<div style="margin:0 0 10px 0;">
<b>Sent:</b> Thursday, January 11, 2018 at 10:22 PM<br>
<b>From:</b> "C. Michael Pilato" <<a href="mailto:cmpilato@red-bean.com">cmpilato@red-bean.com</a>><br>
<b>To:</b> "Richard Cavell" <<a href="mailto:richardcavell@mail.com">richardcavell@mail.com</a>><br>
<b>Cc:</b> <a href="mailto:svnbook-dev@red-bean.com">svnbook-dev@red-bean.com</a><br>
<b>Subject:</b> Re: Suggestion for Chapter 2 rewording
</div>
<div name="quoted-content">
<div>
Richard, thanks for reading at that level of detail. Unfortunately, your new wording reads as though there are still changes forthcoming from the repository -- that is, they haven't come down and been applied to the working copy yet -- and of course, that's simply not true.
<div>
</div>
<div>
Maybe if you were able to identify precisely what bothers you about the original text, I could give better feedback. Is it the use of the word "overlap" (instead of "conflict")?
</div>
</div>
<div class="gmail_extra">
<div class="gmail_quote">
On Thu, Jan 11, 2018 at 10:37 AM, Richard Cavell <span><<a href="mailto:richardcavell@mail.com" on_click="parent.window.location.href='richardcavell@mail.com'; return false;" target="_blank">richardcavell@mail.com</a>></span> wrote:
<blockquote class="gmail_quote" style="margin:0 0 0 0.8ex;border-left:1.0px #CCCCCC solid;padding-left:1.0ex;">
<div>
<div style="font-family:Verdana;font-size:12.0px;">
<div>
Hi everyone.
</div>
<div>
</div>
<div>
The wording of this paragraph in chapter 2 of the Subversion book has always bothered me. I think this patch should explain what I mean, and should provide a clearer understanding to the reader. What do you think?
</div>
<div>
<span class="HOEnZb"><span style="color:#888888;"> </span></span>
</div>
<div>
<span class="HOEnZb"><span style="color:#888888;">Richard</span></span>
</div>
</div>
</div>
<br>
_______________________________________________<br>
svnbook-dev mailing list<br>
<a href="mailto:svnbook-dev@red-bean.com" on_click="parent.window.location.href='svnbook-dev@red-bean.com'; return false;" target="_blank">svnbook-dev@red-bean.com</a><br>
<a href="http://www.red-bean.com/mailman/listinfo/svnbook-dev" target="_blank">http://www.red-bean.com/mailman/listinfo/svnbook-dev</a></blockquote></div></div></div></div></div></div></div></blockquote></div></blockquote><br><div>It was my understanding that G means "merged" (merGed), meaning there were local changes and incoming changes, and Subversion automatically merged them in your working copy. Perhaps some wording along those lines would be helpful.</div></body></html>