154
edits
Changes
→Merge your work back to trunk
== Merge your work back to trunk==
# check and make sure that you have committed your branch
# right click on '''trunk ''' and select '''TortoiseSVN/merge'''
# select your branch
# merge by using default settings and resolve possible conficts
== Test and commit trunk ==