Question: what is g in svn up?
Answer: The G stands for merGed, which means that the file had. > local changes to begin with, but the changes coming from the. > repository didn't overlap with the local changes.