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

Jump to bottom

Begin adding branching strategy #2236

Merged
merged 3 commits into from Feb 5, 2017
Merged

Begin adding branching strategy #2236

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec8ffe5
Begin adding branching strategy
jtsternberg Feb 5, 2017
7c3f54e
Add link to dev status
jtsternberg Feb 5, 2017
cec85fb
update contrib doc
jtsternberg Feb 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions CONTRIBUTING.md
View file
Open in desktop
Expand Up @@ -18,6 +18,10 @@ Reporting a bug
4. If this is a visual bug, please make sure to add a screenshot.
5. if you create a Pull Request for this issue, make sure to attach the Pull Request created to the issue.

Branch Strategy
---
Master will be in sync with the latest release, which will also have its own branch (`branch-x.x.x`). Features should go in `features/*` branches, which then merge into `branch-x.x.x` branch, which then merges to master upon release. Our goal is to keep from merging directly to master. To determine the next branch to fork/PR, review the [Development status](https://github.com/wp-e-commerce/WP-e-Commerce#development-status).

Resources
---
[Labels and Workflow](https://github.com/wp-e-commerce/WP-e-Commerce/wiki/Issue-Labels-and-Workflow)
Expand Down