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.

Sign up for GitHub

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

Updated CONTRIBUTING.md with new branching strategy #54

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
65a766e
Updated branching strategy
DangaRanga May 23, 2021
0a6d4d6
Removed duplicate entry
DangaRanga May 23, 2021
e16a3ad
Updated contributing.md
DangaRanga May 23, 2021
653345e
Added extra markdown styling to contribute.md
DangaRanga May 23, 2021
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
15 changes: 5 additions & 10 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,13 @@ 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, we had employed the following branching strategy to simplify the development process and to ensure that only stable code is pushed to the `master` branch:

The different types of branches we may use are:

- 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/
- `develop`: For unstable code and bug fixing
- `alpha-x.x.x`: for stability teesting
- `master`: Where the stable production ready code lies

### Contributing Code

Expand Down