svn和Git冲突导致Idea远程拉取下来的项目文件全部红色

svn和Git冲突导致Idea远程拉取下来的项目文件全部红色

项目路径下.idea/vcs.xml文件，svn改为Git即可
<?xml version=”1.0″ encoding=”UTF-8″?>
<project version=”4″>
<component name=”VcsDirectoryMappings”>

<mapping directory="$PROJECT_DIR$" vcs="Git" />
<mapping directory="$PROJECT_DIR$/activity" vcs="svn" />
<mapping directory="$PROJECT_DIR$/activity/src/main" vcs="svn" />
<mapping directory="$PROJECT_DIR$/app_base" vcs="svn" />
<mapping directory="$PROJECT_DIR$/app_commentary" vcs="svn" />
<mapping directory="$PROJECT_DIR$/app_resource" vcs="svn" />
<mapping directory="$PROJECT_DIR$/app_visited" vcs="svn" />
<mapping directory="$PROJECT_DIR$/app_visited/src/main" vcs="svn" />
<mapping directory="$PROJECT_DIR$/cl_offline_course" vcs="svn" />
<mapping directory="$PROJECT_DIR$/course" vcs="svn" />
<mapping directory="$PROJECT_DIR$/device_management" vcs="svn" />
<mapping directory="$PROJECT_DIR$/dictionary" vcs="svn" />
<mapping directory="$PROJECT_DIR$/dictionary/src/main" vcs="svn" />
<mapping directory="$PROJECT_DIR$/edu_task" vcs="svn" />
<mapping directory="$PROJECT_DIR$/exam_company" vcs="svn" />
<mapping directory="$PROJECT_DIR$/exam_course" vcs="svn" />
<mapping directory="$PROJECT_DIR$/exam_fromv1" vcs="svn" />

</component>
</project>