Suggestion for Chapter 2 rewording
d.s at daniel.shahaf.name
Sat Jan 13 15:26:33 CST 2018
'G' means the pulled-in change didn't conflict with the local changes;
either because the former touched different parts of the file than the
latter, or because the local and remote changes were identical.
I think "didn't conflict" would be accurate and capture both situations.
(The text needn't explicitly discuss both situations at this point; that
would probably fit better in a sidebar and/or a later chapter.)
More information about the svnbook-dev