... | ... | @@ -33,7 +33,7 @@ Any OAI Git repository holds two (2) main branches with an infinite lifetime: |
|
|
* develop
|
|
|
* We consider `origin/develop` to be the main branch where the source code of HEAD always reflects a state with the latest delivered development changes for the next release. Some would call this the “integration branch”.
|
|
|
|
|
|
![master develop](../images/master-dev-branches.png)
|
|
|
<img src="../images/master-dev-branches.png" width = "267" height = "402" align = "center" />
|
|
|
|
|
|
When the source code in the `develop` branch reaches a stable point and is ready to be released, all of the changes should be merged back into `master` somehow and then tagged with a release number. How this is done in details will be discussed further on.
|
|
|
|
... | ... | @@ -45,7 +45,7 @@ The essence of a feature branch is that it exists as long as the feature is in d |
|
|
These branches always have a limited life time.
|
|
|
Feature branches are created in `origin` so multiple developers can push to the same feature branch with some coordination amongst each other.
|
|
|
|
|
|
![feature](../images/feature-branches.png)
|
|
|
<img src="../images/feature-branches.png" width = "133" height = "357" align = "center" />
|
|
|
|
|
|
* May branch off from `develop`
|
|
|
* Must merge back into `develop`
|
... | ... | @@ -104,7 +104,7 @@ When a critical bug in a production version must be resolved immediately, a bug- |
|
|
The essence is that work of team members (on the `develop` branch) can continue, while another person is preparing a quick production fix.
|
|
|
Bug-fix branches **SHALL** be deleted once the bug fix has been integrated to `master` / `develop` branches and validated through Continuous Integration.
|
|
|
|
|
|
![feature](../images/bugfix-branch.png)
|
|
|
<img src="../images/bugfix-branch.png" width = "316" height = "426" align = "center" />
|
|
|
|
|
|
* May branch off from `master` or `develop`
|
|
|
* Must merge back into `develop` and/or `master`
|
... | ... | |