CVS in Eclipse in Ubuntu

http://help.eclipse.org/helios/index.jsp

Work together in the same branch

Team - Update: Update local files with remote files except local files modified.

Team - Synchronize with Repository: Modified files appear in Synchronize view.

• If conflicts happen, you have three options:
  • accept changes from remote files (Override and Update)
  • ignore changes from remote files (Mark as Merged)
  • manually merge the files within the compare editor, then (Mark as Merged)

Team - Commit: Commit local files to remote files.

Work in different branches and Merge branches

Team - Branch: Create a new branch from current branch.

Team - Merge: [ Branch A and Branch B ] --> Merge --> [ Branch A ] . This means Merge Branch B to Branch A.

• Step1: Replace with - Another Branch or Version: [ Branch A ]
• Step2: Team - Merge: Specify the branch to be merged. [ Branch B ]. 

Team - Commit: Commit local files to remote files.

来源：http://www.cnblogs.com/soulnearby/archive/2011/05/09/2041308.html