Testing and Deployment

The devCopy branch now contains a set of features that are ready for testing. The workflow is as follows:

1. A test branch called testCopy is created from the devCopy branch. This branch contains the two new features that need to be tested.

2. When testing is complete (and if no problems are found), the testCopy branch is merged into the master branch. This means that the changes to the Cluster1 blueprint are now available in the production environment and will be visible on the production version of Site1.

The advantage of these workflows is that all possible merge conflicts are resolved when feature branches are merged into the devCopy branch. Merging the testCopy branch back into the production master branch can therefore be expected to be a clean, trouble-free operation.