Friday, November 19, 2010

CVS - How to Merge branch code to Head in CVS

Follow the below steps to merge your changes:
  1. Import the code from Head into Eclipse workspace
  2. Select the project and choose the option Team > Merge.
  3. Select the name of the Branch from which code needs to be merged.
  4. Click Finish.
  5. A CVS Merge synchronization will be added to the Synchronize view, showing all differences between your workspace and the branch with the changes.
  6. choose Update, Override and Update, or Mark as Merged.
  7. After all desired changes are in the workspace, choose Team > Synchronize with Repository
  8. You may then commit all the changes to the repository.
Hope this helps

No comments:

Post a Comment