On Apr 25, 2011, at 09:43, Ryan Schmidt wrote: >> I tried to update, to get the new files, and to get his updated version. >> >> It reported the files changed, just as I would see in cvs: >> >> C A.txt > > Ok, a conflict occurred
In fact, the current version of Subversion would have asked you at this point what you want to do -- use your version, use their version, edit the file now to resolve the conflict manually, postpone until later (behaves like what you saw above). The fact that you didn't get this prompt suggests you're using an old version of Subversion and should upgrade.
