The information provided in this guide is provided within the scope of the application hotfix development and deployment to a production environment. The guidelines and practices outlined here are not meant to be used for supporting concurrent feature development.
IMPORTANT: It is recommended to only create hotfixes for critical changes that cannot wait until the next version of the application is released. This is to keep disruptions to the development team to a minimum and to avoid incurring the cost of applying the change twice (once for the production version and again for the latest version in development).
CORE PRINCIPLE: Work on a version of the artifacts that matches the one in production.
If a collision is detected, a merge strategy should be outlined between the hotfix developer and the active workstream development team.
This strategy should be documented in the change log.
Environment Set-up
Development
Merging