154
edits
Changes
→Merge your work back to trunk
# make sure that you have committed the work in your workspace to the repository server - commit again if uncertain
# right click on '''trunk''' and select '''TortoiseSVN/merge'''
# select reintegrate a branch and click Click Next# select the workspace that you wish to merge and Click Next# your branchclick Test Merge
# merge using default settings and resolve possible conficts
: ''you are now ready to test your merged trunk and commit your work to the server''