Skip to content

Commit

Permalink
Merge pull request #54 from DangaRanga/master
Browse files Browse the repository at this point in the history
Updated CONTRIBUTING.md with new branching strategy
  • Loading branch information
DangaRanga authored May 23, 2021
2 parents d34faa7 + 653345e commit 13180c2
Showing 1 changed file with 5 additions and 10 deletions.
15 changes: 5 additions & 10 deletions CONTRIBUTING.md
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

0 comments on commit 13180c2

Please sign in to comment.