Skip to content

Adding branch description to Contributing #2256

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

Merged
merged 5 commits into from
Aug 29, 2017
Merged

Adding branch description to Contributing #2256

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7941067
Merge pull request #2248 from biocore/dev
josenavas Aug 21, 2017
6080742
Merge pull request #2249 from biocore/release-candidate
josenavas Aug 23, 2017
73dca6f
Adding branch description
josenavas Aug 29, 2017
7e86f7a
Adding spaces
josenavas Aug 29, 2017
0d04d92
Adding timeline
josenavas Aug 29, 2017
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
8 changes: 8 additions & 0 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,14 @@ always take into consideration how these new features affect users and whether
or not adding a new section or document to the documentation (found under the
`doc` folder) would be useful.

###Repository branch structure
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just noticed that the ### is not being rendered as a title, see here. Seems to be a problem with a missing space between ### and the first letter in the title.


The Qiita repository contains three branches:

* `master`: This branch reflects the code deployed in our [main Qiita server](http://qiita.microbio.me).
* `dev`: This branch is the active development branch. All new Pull Requests should be performed against this branch.
* `release-candidate`: This branch is used to freeze the code from the `dev` branch, so we can deploy in our test servers and exercise the code extensively before deploying in our main system.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want to make the test server URL public? Also, would it be worth noting the timeline?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

By timeline I mean how long each branch is alive for, when are freezes happening, etc.


###The Qiita development rules

Since Qiita is a package that is continuously growing, we found ourselves in a position where development rules needed to be established so we can reduce both development and reviewer time. These rules are:
Expand Down