Is there a git workflow designed to support software from several git branches (for example, release.1.1 branch from the wizard long ago and release .1.2 branched from the wizard recently). Separation of functions The workflow, the Gitflow workflow, and the Forking workflow have excellent documentation, but I did not find information on managing more than one version.
Managing multiple versions will require the installation of fixes and features for one or more releases. The master branch will be used to save all changes for future releases, the release closest to the owner may receive some functions and corrections, the most distant releases will receive the least amount of updates and the release far from the master will be the first to reach the end of life.
I think it will look like
master -------+----------+----------+----------+------+-----------+--------------------
\ \ \ / \ /
\ \ Hotfix-+ Feature-+
\ \ Hotfix Feature
\ release_1.2-------+------------------+---------------
\ Hotfix
release_1.1------------------+----------------------End-Of-Life
The following has been revised to look more like git Flow, but with the 'release_1.1' branch.
release_1.1---------+---------+---
| \ /
| Hotfix3
|
tag 1.0 tag 1.0.1 tag 1.1 tag 1.1.1 tag 1.2 tag 1.2.1
| | | | | |
master +-----------+-------------+--------+-------------+--------+------------------
| / / / / /
| / / / / /
\ Hotfix1 / Hotfix2 / Hotfix3
release | \ +-+-+ \ +-+-+ \
| \ / \ \ / \ \
develop +-+--------+---+-------+-+--------+---+-------+----------+------
\ / \ /
FeatureA-+ FeatureB-+
source
share