SVN knows that changes have occurred in the repository, but he does not know what these changes are. You may have made the same change in your working copy, but if you are not really trying to upgrade so that SVN can run the solution, it will not verify that your local changes match the repo changes.
Do svn update , and conflict resolution should be automatic. Although, if you make changes to the same files, it may ask you to manually allow, even if it is the exact same change (even more likely if the change was renamed to a folder)
You may need svn resolved to manually resolve conflicts.
Worst of all, you can always copy files that you changed, undo local changes, update and replace files in a new folder.
Franci penov
source share