Merging ongoing development work

After Baseline 1 is created, the MAJ team merges the Baseline 1 changes into its work (see the following figure). The team now has access to the minor enhancements it needs for further development. Team members also have an early opportunity to determine whether any of their changes are incompatible.
Figure 1. Updating major enhancements development

Two horizontal parallel lines are marked MAJ Team and MIN Team.

Accordingly, the project manager declares a freeze of major enhancements development. MAJ team members check in all elements and verify that the monet application builds and runs, making small source changes as necessary. When all such changes have been checked in, the team has a consistent set of /main/major/LATEST versions.

Tip: Developers working on other major enhancements branches can merge at other times, using the same merge procedures described here.