<para>\r
Sometimes when you try to update, the update fails with a message to\r
say that there is already a local file of the same name. This typically\r
- happens when Subversion tries to checkout a newly versioned file, and finds\r
+ happens when Git tries to checkout a newly versioned file, and finds\r
that an unversioned file of the same name already exists in your working\r
- folder. Subversion will never overwrite an unversioned file - it might\r
+ folder. Git will never overwrite an unversioned file - it might\r
contain something you are working on, which coincidentally has the same\r
filename as another developer has used for his newly committed file. \r
</para>\r