21
edits
Changes
→working on your branch/workspace
*: <big>'''It is your responsibility to keep your code safe'''</big>
* If you have any problem with your code, and need help, contact your professor, send the path of your workspace. If needed, he can checkout your code see what is wrong with it and leave comments on it and commit it. Afterwards, all you need to do is update your repo and read the comments and corrected code.
== Merging you work back to trunk ==
After you have done your work in your workspace and your work is compiling and ready to go, to merge you work back to trunk:
# 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.
# Make sure "From URL" is the branch you want to merge and click on next.
# click on "test merge" to see if merge is done successfully.
# click on "merge" to merge the branch back to trunk
# now update the trunk to have the possible changes applied.
# if there is any conflict click on "...SVN/edit conflicts" and fix the conflict, save and click on conflict resolved"
# check the trunk status in your team page on wiki
## If the trunk status is "committed" then change it to "being commited by your_name"
## If the trunk status is "being committed by member_name", wait for the commit to complete and to to previous step.
== Q&A ==
