First, the detection of checkout two, color corresponding to three, file commit four, file update## five, Project synchronization # # Six, Conflict resolution # # 5.1 Scene 5.2 Update Action # 5.3 Conflict # # 5.4 Resolve Conflict # #
First, check out checkout
1. Homepage Select subversion
2. Select an item in repository (if not repository, add it first)
3. Select the physical path checked out to the local PC
4. Select the project's specific project path
5. After checking out, open the project
second, color correspondence
In idea, the different colors of the filenames represent different svn meanings. Green, has been added control is not submitted red, not added version control Blue, joined, has been submitted, has changed white, joined, has been submitted, no changes
Gray: Version control has ignored files.
Third, the document commits
Right-click-subversion-commit file/directory iv. file update##
Right button-subversion-update file/directory v. Project Synchronization # #
Select Project Root – Right-–subversion-compare with Branch Vi. Conflict Resolution # # 5.1 scenes
The file Dog.java has been modified and committed on the other client, and the current client has modified the file but has not yet committed it. 5.2 Update Action # #
5.3 Conflicts # #
Idea suggests a conflict, click "Merge" to merge
5.4 Resolving Conflicts # #
End