merge from svn repo
ignore project files
svn merge