I inadvertently modified a copy of FileX shared with TortoiseSVN. My assistant, who has been working on the file posted his changes to the SVN Repository. When I ran an SVN update, SVN reported a conflict on the file. I don't want to merge the two versions of the file. I just simply want to overwrite my local copy of the file with the repository version. How do I do so?