Right-click on the project and select Team->Synchronize with the resource library (S)->team synchronizing mode in the synchronize interface, if there is a red mark, it indicates that the content conflicts.
Double-click to open the file marked in red , the version on your machine is on the left, and the latest version is on the right. If there is no red mark in the content, it means that the content does not conflict, you can update it first and then submit it. But when there is red, there is a content conflict. According to the red prompt, restore the red part of the machine first, and then submit after updating.
After the red part is processed, the blue part is the content that needs to be updated, just right-click to update, or you can double-click to view the content.
The gray ones are the content that needs to be submitted, just right click and submit.
Detailed explanation of various icons of svn in eclipse
Files ignored from version control. Files can be ignored via Window → Preferences → Team → Ignored Resources.
A file ignored by version control. You can control what resources will be ignored by going to Window → Preferences → Team → Ignored Resources.
-
Files not included in version control are generally newly added files that have not yet been submitted.
A file not under version control. These are typically new files that you have not committed to the repository yet. -
Files locally renamed or moved to another directory.
A versioned file that needs to be added to the remote repository. These are typically files you have either renamed, or moved to a different directory. -
本地删除的目录。
A deleted folder. These are folders that you have deleted locally without yet committing the changes to the repository. Note that files are usually removed from the view when they’re deleted locally, so they are normally not seen with this icon. -
Files without any changes.
A file with no local changes. -
A file that has changed and has not yet been committed.
A file with local, uncommitted changes. -
Files that are locked.
A locked file. -
If there are conflicts that are not resolved, just update or commit the files.
A conflicted file. These are typically files that had a commit/update conflict that you marked to resolve later. -
There are files with directory tree conflicts. Typically files on the repository were moved, deleted, or renamed after the last update.
A file that has a tree conflict. These are typically files that have local changes, but have since been moved, removed, or renamed in the repository since the last local copy update. -
Files referencing external projects cannot be submitted to the repository of this project.
A file that is external to the project. Linked external files cannot be committed to the repository. -
There are branched versions of the files. These files belong to a different working directory than the local parent directory.
A file that has been switched. These are files which belong to a different working copy than their local parent directory.
Move out Outgoing view
-
There are changed files locally.
A file whose contents have been modified and will be committed to the repository. -
本地新增的文件。
A file that will be newly added to the repository. This may coincide with a file removal in cases where a file is moved or renamed… -
本地删除的文件。
A file that will be removed from the repository. This may coincide with a file addition in cases where a file is moved or renamed. -
Files whose local file attributes have changed.
A file with property changes, in the Commit dialog. On the Synchronize tab, property changes are currently reflected as a normal file modification ().
Move into Incoming view
-
需要更新的文件。
A file that has content changes committed to the repository that will be applied to the local copy. -
需要迁入的新增文件。
A new file that will be added to the local copy from the repository. Like the outgoing file addition, this may be the result of a move or rename. -
资源库中删除了的文件。
A file that will be removed from the local copy because it has been removed from the repository. Like the outgoing file removal, this may be the result of a move or rename.
Conflict view
-
There are modified files in the repository and locally at the same time.
A file that has been changed in both the local copy and repository independently, causing a need for conflict resolution. Fixing this condition involves opening up the conflict view or forcibly overwriting changes locally or remotely. -
Files that have been renamed, moved, or deleted on the remote repository.
A file that has a tree conflict. This can occur when there are new changes to a file on one end (either local or remote), and the file is moved, removed, or renamed on the other.
Some buttons on the interface opened by the "Sync with repository" option Others:
Finally, the Synchronize with Repository option opens the Synchronize tab () with the following buttons:
-
Synchronize the selected files, drop down the arrow to switch between different remote directories.
Synchronizes the local copy with the currently selected repository when clicked. Selecting from the drop-down allows switching between different remote code bases. -
Show only the files that need to be imported.
Shows only incoming changes (remote → local).
- Only files that need to be submitted are displayed.
Shows only outgoing changes (local → remote).
- It also shows that files need to be updated or submitted.
Shows both incoming and outgoing changes (remote ↔ local).
- Show only conflicting files.
Shows conflicting changes.
- Update all files.
Updates all local resources with incoming changes after prompt.
- Submit all documents.
Brings up the commit dialog to commit all outgoing changes.