Another situation that warrants special consideration is the case where two change packages must be applied from different variants. Unless the correct procedure is used, Resync CP will fail because too many merges are required.

For example, the master project contains the file patch.c at revision 1.4. The variant project used by the buildmaster contains a fix (patch.c, revision 1.2.1.2, CP 9:1) that is being rolled out for a product patch. The variant project for the Maintenance Development team also includes a bug fix for patch.c at revision 1.3.1.2, and this revision is associated with CP 10:1. Both fixes are required for the master project.

There are only two ways to successfully complete the preceding scenario without restrictions: address it manually, or perform Resync CP and Apply CP twice (once for each change package), checking in the merged changes at the head revision after each operation.