Skip to content

Commit 64492f1

Browse files
committed
Updated feature branch description
1 parent 251652f commit 64492f1

File tree

1 file changed

+27
-2
lines changed

1 file changed

+27
-2
lines changed

docs/Developer/GitFlow.md

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,34 @@ gitGraph TB:
9595

9696

9797
### Feature branches
98-
Our development branch is considered to be the main branch, where features are branched off of development and merged back into development.
9998

100-
[![](https://mermaid.ink/img/pako:eNqtlE1vm0AQhv_KaCuLC7EMxsHmZpr6Q3KTKk57aOlhDWPYBli6LE5ci__eXWwaW7VVH8qKAw_z8c6MZnck5BESj3Q6O5Yz6cEOjJTHC9xganhgRLiqYsMEQyaYoSYrWuIf8IUKRlcplurPLshBPUbMZE8bvptM_EmvZ5hv3Gr42NHnmNvHPMhrU8OpoEWi4xqCSyrxPc8yJhd01SiTokKlokz4iy9oHiaNhiN6Yn7gGWX53vqe7qu504XyIsNcGnUNdafTqGrTw5Pv7WUChE1AYJEHAdHNYjRt4f10ZFkBaU1XTQ6YIJWVwPHZCN_my-XnDzeOZX8HrQYe1jAvywoDApLGXkCKKk1vBP6ssJRvsU-ChAnNY4SEikgPUh3Y0FQ5XLBfs1eQ24KXhyQKTZmcVSsYh5Lx_JJfhkKlEUijrfbcFujBbD6dLdT7dJD7iBuGL0cBEgyfeSXhqMfX9LIQ_AeGEuxL_fSvybBX3E6gLbahEazbwVwntv33V_4z87Sc_qV5fnr8d3fhv7T3pHj_fPG-DkVMTdVaROoOaBY4IM1iB0R7RFQ8a7Na2dFK8uU2D8l-mUhVRGop7xiNBc2It6ZpqShGTHLxcX-pNHeLSQqaf-U8ax3VJ_F25JV4t4OuO7y1B447Gg6tgT0yyZZ4fadrubfu0LJGCg2Gdm2SX41_rztyRj3XdWy3P3TtvjuofwOb-nzg?type=png)](https://mermaid.live/edit#pako:eNqtlE1vm0AQhv_KaCuLC7EMxsHmZpr6Q3KTKk57aOlhDWPYBli6LE5ci__eXWwaW7VVH8qKAw_z8c6MZnck5BESj3Q6O5Yz6cEOjJTHC9xganhgRLiqYsMEQyaYoSYrWuIf8IUKRlcplurPLshBPUbMZE8bvptM_EmvZ5hv3Gr42NHnmNvHPMhrU8OpoEWi4xqCSyrxPc8yJhd01SiTokKlokz4iy9oHiaNhiN6Yn7gGWX53vqe7qu504XyIsNcGnUNdafTqGrTw5Pv7WUChE1AYJEHAdHNYjRt4f10ZFkBaU1XTQ6YIJWVwPHZCN_my-XnDzeOZX8HrQYe1jAvywoDApLGXkCKKk1vBP6ssJRvsU-ChAnNY4SEikgPUh3Y0FQ5XLBfs1eQ24KXhyQKTZmcVSsYh5Lx_JJfhkKlEUijrfbcFujBbD6dLdT7dJD7iBuGL0cBEgyfeSXhqMfX9LIQ_AeGEuxL_fSvybBX3E6gLbahEazbwVwntv33V_4z87Sc_qV5fnr8d3fhv7T3pHj_fPG-DkVMTdVaROoOaBY4IM1iB0R7RFQ8a7Na2dFK8uU2D8l-mUhVRGop7xiNBc2It6ZpqShGTHLxcX-pNHeLSQqaf-U8ax3VJ_F25JV4t4OuO7y1B447Gg6tgT0yyZZ4fadrubfu0LJGCg2Gdm2SX41_rztyRj3XdWy3P3TtvjuofwOb-nzg)
99+
Our shared development branch is considered to be the main branch, in terms of being the latest functioning code (which may or may not be ready for merging into master and creating a release). So, all personal development branches start off as functioning code and are not merged back into the shared development branch until they are once again functioning code. Until then, features are branched off of the personal development and merged back into personal development.
100+
101+
```mermaid
102+
%%{init: { 'logLevel': 'debug', 'theme': 'base', 'themeVariables': {
103+
'git0': '#FFBF00',
104+
'git1': '#A4A4A4',
105+
'git2': '#A4A4A4'
106+
},'gitGraph': {'rotateCommitLabel': true, 'showBranches': true, 'showCommitLabel':true, 'mainBranchName': 'AUserDev'}} }%%
107+
gitGraph TB:
108+
commit id: "initial commit NG911"
109+
branch FeatureA
110+
commit id: "[ISSUE-412] Name Of Issue" tag:"pull-request"
111+
commit id: "change hardcodeded values"
112+
commit id: "fix typos" tag: "GitHub Actions"
113+
commit id: "merge ready" type: HIGHLIGHT tag:"Review"
114+
checkout AUserDev
115+
commit id: "initial commit project 2"
116+
branch FeatureB
117+
checkout AUserDev
118+
merge FeatureA tag: "merged featureA"
119+
checkout AUserDev
120+
checkout FeatureB
121+
commit id: "[ISSUE-143] Name Of Issue" tag:"PR"
122+
commit id: "merge ready " type: HIGHLIGHT tag:"Review"
123+
checkout AUserDev
124+
merge FeatureB tag: "merged featureB"
125+
```
101126

102127
### Merging to Master Branch
103128
The master and development branches exist parallel to one another. We consider the development branch to be the main branch where the source code always reflects a state with the latest delivered development changes. Once the development branch is ready to merge back to the master, we create a release branch (not supported in our document). Our version can either cherry-pick the developments we want into the master or revert the changes and merge to the master and re-revert the changes (not supported in the document).

0 commit comments

Comments
 (0)