...
Once deployment is complete, the Production environment can considered to be at release prod-44.2 (since this is production release 44 with the second commit from the hotfix branch Hotfix-44 applied to it.
...
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. |
...
The simplest and most effective approach to integrating your hotfix changes back into your Main branch is to manually re-apply them in your development project associated with your Main branch. Once these changes are committed to Git they progress along your regular delivery pipeline, including all the testing processes they would have skipped during hotfix deployment.
...