Merging Dev to ‘User Acceptance Testing' (UAT)
First time only doing this, create a MERGE workspace to have a copy of Trunk alongside the working copy in c:/MERGE
- Switch workspace to MERGE
- Select the source (Trunk), right click and Get Latest
- Select the destination (UAT), right click and Get Latest
- Right click on Source, Branching & merging --> Merge
- Check source and destination are correct and that All changes radio button selected
- Next --> Next --> Finish
- Right click Destination and Check in pending changes
- Add in comment Merge from Trunk to the UAT branch (latest version), work item 4 and MT code reviewer
- Change back to regular workspace