...
Once a hotfix change has been deployed to Production, the next step is to incorporate this change back into your Main branch so that it is included in subsequent releases.
The principal intent of creating a hotfix branch is to support the delivery of time-critical changes to Production whilst avoiding the need to halt ongoing development of new feature and non-time critical defects in your development codebase.
| Note |
|---|
The traditional approach of using a Git merge will not work with DataStage, as your DataStage project is a shared working copy of your Git repository. Do not be tempted to adopt a branch merging approach as you will have no easy mechanism for resolving merge conflicts. |
...