154
edits
Changes
→Merge your work back to trunk
# right click on '''trunk''' and select '''TortoiseSVN/merge'''
# select reintegrate a branch and Click Next
# select the workspace that you wish to merge , use default settings, and Click Next# click Test Merge # merge using default settings and resolve possible conficts: # once test is successful, Click Merge''you are now ready to test your merged trunk and commit your work to the server''
== Test and commit trunk ==
