The conflict between SVN and Git causes the project files pulled down remotely by Idea to be all red.

Time:2019-10-15

The conflict between SVN and Git causes the project files pulled down remotely by Idea to be all red.

Under the project path. idea / vcs. XML file, SVN can be changed to 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>

Recommended Today

Sharing 10 useful methods of laravel 5.8 sets

This article is forwarded from the professional laravel developer community, original link: https://learnku.com/laravel/t… In laravel, there is a very useful class for manipulating arrays, called collections. I believe that every developer of laravel has used the collection more or less, especially when operating eloquent. In this article, I will list 10 common methods. 1. Weight […]