1 <?xml version="1.0" encoding="UTF-8" ?>
2 <cheatsheet title="Merge CVS branches">
5 href="/org.eclipse.platform.doc.user/reference/ref-cheatsheets.htm">
7 This cheat sheet shows you the steps to merge changes from one CVS branch
8 into another, or into HEAD. If you need help at any step, click on the (?)
14 href="/org.eclipse.platform.doc.user/tasks/tasks-100b.htm"
15 title="Determine branch and version information">
17 The first step is to decide <b>which</b> two branches will be merged, at
18 which <b>version</b> the content was branched, and what the
19 <b>destination</b> branch will be (where the result of the merge will go).
20 Once you have this information, you can move on to the next step.
25 href="/org.eclipse.platform.doc.user/tasks/tasks-96.htm"
26 title="Check out the project">
28 Before merging, you must <b>check out</b> the project you wish to merge
29 and bring it into your workspace. You can do this either via the import
30 wizard or by adding your repository from the CVS Repository Exploring
31 perspective, or click the (?) button for help.
36 href="/org.eclipse.platform.doc.user/tasks/tasks-103.htm"
37 title="Load the destination into your workspace">
39 In the navigator, right-click on the project and select Replace With >
40 Another Branch or Version. Select the destination branch. This will load
41 the branch's latest content into your workspace.
46 href="/org.eclipse.platform.doc.user/tasks/tasks-100b.htm"
47 title="Merge details">
49 Again in the navigator, right-click on the project and select <b>Team</b>
50 > <b>Merge</b> and complete the steps in the wizard. In this wizard you
51 specify the details of the merge.
56 href="/org.eclipse.platform.doc.user/tasks/tasks-100b.htm"
57 title="Work with the Merge editor">
59 In the Merge editor manually merge the changes. This step loads the
60 required changes into the workspace. Once you've merged all the changes
61 and are satisfied with the result, move on to the next step.
66 href="/org.eclipse.platform.doc.user/tasks/tasks-114.htm"
67 title="Commit your changes">
69 Right-click on the project and select <b>Team</b> > <b>Synchronize with
70 Repository</b> and then commit all the changes to the repository. This
71 step finalizes the transfer of the changes from the workspace to the CVS
72 repository, and finalizes the merge.