Resolving a merge conflict when I do svn update

Question

I am trying to learn basics of version control by Eric Sink - http://ericsink.com/vcbe/vcbe_usletter_lo.pdf

I am on page 22 now. I\'ll describe the scenario for you. Two

Answer 1

The "G" indicates that the file was modified by somebody else, but the modifications that person did were in a different part of the file, so SVN could merge it for you without asking for help.

The "C" indicates that not only was the file modified by somebody else, but their changes were to the same lines you also changed, so SVN doesn't know what to do. Now it's YOUR job to do the merge.

You probably didn't do anything wrong, and the book isn't wrong, they just left out the detail on what the specific changes were, apparently.