154
edits
Changes
→merge the branch back to trunk
# commit (commit changes back to repo on server)
== merge the branch Merge your work back to trunk==# make sure that you have committed your 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