Step 14: Merge Changes Back Into Source Control

Merging changes back into source control is specifically listed here as a separate step to highlight its importance. In actual practice, you can merge changes back into source control as you perform Steps 9 through 12.

When merging changes back into source control, you must:

• Verify that all existing customizations are tagged and stored in the version control system.

• Check in all new customizations after completing the test upgrade cycle, including the following modified items:

  • Database table scripts

  • Repository objects

  • File system objects, such as JSP files and images