21
edits
Changes
→branch the trunk for development
*: how to do goes here
* update your repository to get the branch on your local machine
== start coding and complete the task==
# code
# compile
# test
# compile
# commit (commit changes back to repo on server)
== merge the branch back to trunk==
# make sure branch is commited
# right click on trunk and select TortoiseSVN/merge
# select your branch
# merge by default settings and resolve possible conficts
== Test and commit trunk ==
# recompile and test merged trunk
# update trunk status on wiki team page to '''commiting'''
#: if the status is already commiting wait for it to be done
# commit trunk
# resolve possible problems
# commit again
# update trunk status on wiki team page to ''' commited'''
== Resources ==
* [[Hints for Using SVN to collaborate on school projects]]
