RSS

Is merging CVS branches complex..?

17 Apr

Merge CVS Branches

Hi folks,

Just follow the below steps to merge the two branches of codebases.

1. Determine branch and version information 

The first step is to decide which two branches will be merged, at which version the content was branched, and what the destination branch will be (where the result of the merge will go). Once you have this information, you can move on to the next step.

2. Check out the project

Before merging, you must check out the project you wish to merge and bring it into your workspace. You can do this either via the import wizard or by adding your repository from the CVS Repository Exploring perspective, or click the (?) button for help

3.Load the destination in to your workspace

In the navigator, right-click on the project and select Replace With > Another Branch or Version. Select the destination branch. This will load the branch’s latest content into your workspace.

4. Merge details

Again in the navigator, right-click on the project and select Team > Merge and complete the steps in the wizard. In this wizard you specify the details of the merge.

5. Work with the merge editior

In the Merge editor manually merge the changes. This step loads the required changes into the workspace. Once you’ve merged all the changes and are satisfied with the result, move on to the next step.

6. Commit your changes

Right-click on the project and select Team > Synchronize with Repository and then commit all the changes to the repository. This step finalizes the transfer of the changes from the workspace to the CVS repository, and finalizes the merge.

Happy Learning!.

Get glued to know more updates.

Have a nice day:-)

 

Advertisements
 
Leave a comment

Posted by on April 17, 2013 in Uncategorized

 

Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out / Change )

Twitter picture

You are commenting using your Twitter account. Log Out / Change )

Facebook photo

You are commenting using your Facebook account. Log Out / Change )

Google+ photo

You are commenting using your Google+ account. Log Out / Change )

Connecting to %s

 
%d bloggers like this: