Skip to content
This repository has been archived by the owner on Mar 21, 2018. It is now read-only.

Commit

Permalink
docs(contributing): Revert to develop branching strategy
Browse files Browse the repository at this point in the history
  • Loading branch information
pixelastic committed Nov 3, 2015
1 parent 3e0bc46 commit e079b44
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,11 @@ already referenced. If not, feel free to open one.
We use [pull requests](https://github.com/algolia/algoliasearch-jekyll/pulls)
for collaboration. The workflow is as follow:

- Create a local branch, starting from `master`
- Submit the PR on `master`
- Create a local branch, starting from `develop`
- Submit the PR on `develop`
- Wait for review
- Do the changes requested (if any)
- We may ask you to rebase the branch to latest master if it gets out of sync
with `master`
- We may ask you to rebase the branch to latest `develop` if it gets out of sync
- Receive the thanks of the Algolia team :)

# Development workflow
Expand Down Expand Up @@ -42,7 +41,7 @@ This part is for main contributors:
# Update master and release
./scripts/release
# Install the gem locally
# Install the gem locally (optional)
rake install
```

Expand Down

0 comments on commit e079b44

Please sign in to comment.