Merging Trunk updates to your Branch

Read this sections if you want to merge changes made to the Trunk into your branch.

Your Branch does not automatically update when changes are made to the Trunk. To get changes made to the Trunk into your branch, follow the following steps:

1. Make sure all your changes are committed to your Branch. Executing "svn status" in the source directory should not return any output.
2. You can update your branch using the command "svn merge ^/Trunk" in your source directory
3. Merging doesn't always go smoothly. You might get conflicts when you edited a file that we edited as well. 'svn merge' will ask you to accept the changes, or postpone the decision. When in doubt, postpone and fix the issue later.
4. Make sure all your code compile correctly. Executing "make fullTest" in the build directory should return "100% tests passed".
5. If some codes don't compile, you have to look into your code and find the issues (That's teh difficult part. Ask one of the other developers for help if necessary.)
6. If you cannot resolve the issues, you can undo the merge using 'svn revert . -R' in your source directory.
7. If you could resolve all issues (i.e. "make fullTest" returns "100% tests passed"), then commit your changes:

   svn commit -m "Merged Trunk changes into my local branch"