28 lines
900 B
Markdown
28 lines
900 B
Markdown
# branching strategies
|
|
|
|
### table of contents
|
|
[home](README.md) •
|
|
[glossary](glossary.md) •
|
|
[common commands](common_commands.md) •
|
|
**[branching strategies](branching_strategies.md)** •
|
|
[troubleshooting](troubleshooting.md) •
|
|
[ssh setup](ssh_setup.md)
|
|
|
|
---
|
|
|
|
## Branch to env mapping
|
|
* [Env branch mapping](https://www.wearefine.com/mingle/env-branching-with-git/)
|
|
* [gitlab flow](https://docs.gitlab.com/ee/workflow/gitlab_flow.html)
|
|
* [oneflow](http://endoflineblog.com/oneflow-a-git-branching-model-and-workflow) (gitflow with one instead of two long-living branches)
|
|
|
|
### branch -> env
|
|
* prod -> prod
|
|
* mo -> mo
|
|
* qa -> qa
|
|
* **master** -> dev (feature branches are created from master)
|
|
* specific tagged commits can be deployed from master to any of the dev or qa envs
|
|
|
|
Env configs can be generated with a combination of env vars and other source-controlled files
|
|
|
|
|