This is an open forum for any mojoPortal topics that don't fall into the other categories.
Right click the Web.config file and do TortoiseSVN > revert
Then do svn update again and it should be up to date with no conflicts.