Changes

After you have done completed your work in within your own workspace and your work code compiles and is compiling and ready to go, to you can merge your work back to trunk. These are the detailed steps:# Right click on '''trunk ''' or '''trunk/prj''', depending on what you branched into branches # Select "...SVN/Merge" and , select "reintegrate a branch" , and click on next.

# click Click on "test merge" to see if the merge is done successfullysuccessful.# click Click on "merge" to merge the branch back to trunk# now Now update the trunk to have apply the possible changes applied.# if If there is are any conflict conflicts, click on "...SVN/edit conflicts" and fix the each conflict, save and click on conflict resolved"# check Check the trunk status in your team page on the wiki#:* If the trunk status is "committed" then change it to "being commited committed by your_name"#:* If the trunk status is "being committed by member_name", wait for the commit them to complete their commit and to go to previous step.# commit Commit the trunk and when done, update the truck status to "commited committed by your_name"# if If this commit was worth recording, branch it in the tags directory under a new release.

If you are having the receive a "branch/project must be ancestrally related to trunk/project" error, try going into your trunk and right click > merge one file at a time. Make sure to click the "show log" button in the merge wizard to get the latest revision for the merge added for you.