Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated CONTRIBUTING.md with new branching strategy #54

Merged
merged 4 commits into from
May 23, 2021
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Updated branching strategy
DangaRanga committed May 23, 2021

Verified

This commit was signed with the committer’s verified signature.
bdehamer Brian DeHamer
commit 65a766e459685a5c9e20881dfa184b0fefffcd0c
15 changes: 6 additions & 9 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -36,18 +36,15 @@ Make sure you are following [issue report guidelines](https://github.com/Palisad

[Pull Request guidelines](https://github.com/PalisadoesFoundation/talawa-admin/blob/master/PR-guidelines.md) is best resource to follow to start working on open issues.

#### Git Flow
#### Branching Strategy

For Talawa Admin, we utilize the GitFlow branching model. GitFlow is geared towards efficiently tracking development and managing releases. The model makes parallel development efforts easy and safe by isolating new development efforts from completed work.
For Talawa Admin, to simplify the development process, and to ensure that only stable code is pushed to the `master` branch, we had employed the following branching strategy:

The different types of branches we may use are:
- Develop branch: For unstable code and bug fixing
- Alpha-x.x.x: for stability teesting
- Master: Where the stable production ready code lies

- Feature branches (feature/branch-name)
- Release branches (release/1.XX)
- Bug branches (bugfix/branch-name)
- Hotfix branches (hotfix/branch-name)

Detailed document containing how GitFlow works: https://nvie.com/posts/a-successful-git-branching-model/
### Contributing Code

### Contributing Code