154
edits
Changes
→Merge your work back to trunk
# click Test Merge and resolve possible conficts
# once test is successful, Click Merge
''you are now ready to test your merged trunk (on your local workstation) and commit your work merge to the server''
== Test and commit trunk ==
