SM reported an SVN conflict, which took me a good while to figure out. It turned out to be caused by her having made a very minor edit to her file (adding a comment to mark where she was up to) after committing the file last week. Then when I made changes on Monday, my changes were against the old version, and SVN complained when she tried to do a checkout. Advised moving the local copy somewhere else, then updating, and re-inserting the comment.