1
In eclipse
Same as CVS
Server
Before the server is synchronized, refresh the server first. Otherwise
Files edited outside, eclipse
Without refreshing
Synchronization error occurs.
Set to automatic refresh. Operation Method: window-> preferences-> workbench
,
Select refresh workspace automatically
. Even so, problems may still occur because eclipse
Brush
There may be a certain delay in the new version, so when an error is reported, manually refresh the page and then synchronize.
2
Before leaving the company, commit
Institute
There are files, update after work
All files, and build
To correct the version submitted yesterday.
.
3
Before modifying the file, update
I
To make the modified version as new as possible. Once a conflict occurs, the workload for solving the problem will be relatively small. For files that are commonly used and modified, such as constants. Java
Struts-config.xml
And so on
File, but more importantly, it is best to notify other personnel to commit
.
4
For binary files, such as Word
Text
File, CVS
Comparison is not allowed. If a conflict occurs, you need to manually merge the files. You can back up the local files and override the files.
Update
And then merge and submit the modified parts in the backup file.
5
In case of file conflicts
First, compare and update the modifications on the server to the local device. If it is unclear, communicate with others. After the merger, select override and commit.
More
New. do not perform override and commit without comparison.
Operation!
6
, CVS
No
You are allowed to delete files on the server. Therefore, you are advised not to submit temporary files and directories, such as files and directories generated by compilation.
7
Separate files of different functional modules. Commit
,
One-time commit of files in the same functional module
It helps analyze errors, reduce conflicts, and roll back versions.
8
The submitted files must be tested. At least the files can be compiled locally for convenience.
Others test.