Skip to content

Commit

Permalink
Merge pull request #69 from zheins/contributing-branch-update
Browse files Browse the repository at this point in the history
Adding note about branches
  • Loading branch information
zheins authored Jun 10, 2022
2 parents 61f5f8e + 66d3e72 commit 2ab1775
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,13 @@ When you are ready to submit your pull-request:

For more details on submitting a pull-request, please see: [GitHub Guide to Collaborating with issues and pull requests](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests).

## Branches within eVOLVER
Each eVOLVER repository maintains three branches:

* **master**: This reflects the current release of eVOLVER software. Typically you should not make PRs into this branch.
* **rc**: Release candidate branch. This branch is for new feature development and testing before releasing into master. Once we are ready to release all the new features out we will merge this branch into master.
* **hotfix**: This branch is used for bug fixes that need to immediately go into master and be released before other features in RC are ready. Once bugs are fixed in this branch, the changes are merged into master and rc.

### Getting your changes reviewed

Once you've submitted your pull request, you want
Expand Down

0 comments on commit 2ab1775

Please sign in to comment.