- We can keep master branch as production branch.
- We can create a branch develop from where developer can create branches for development.
- For feature development every developer will create branch from develop branch. And branch name will be in following convention feature/issue-no-issue-title
- For bug fixes developer will also create branch from develop branch. And follow convention like this bug/bug-no-bug-title.
- For hotfixes in production server developer will create branch from master branch and follow convention like this hotfix/issue-no-issue-name
- After development complete in features and bugs, all feature and bug branches will merge to develop branch.
- Git admin will create a branch with release tag before give a release and stop coding from release branch.
- If QA find any bugs in this release then release version will be change.
- Hot Fixes branch will be merge directly to master after changes tested bu QA and developer.
Suggestions:
- Please pull develop branch to your working branch(except hotfix branch) and then push your changes. Then git admin can easily merge your branch to develop branch.
- Please follow following convention for git message when you commit your changes [refs #issue_no] - Short Description of your changes.
0 Comments