From 10622d4d9e150eb3d05a3f8ab82b11c4e4dccaac Mon Sep 17 00:00:00 2001 From: Pixelastic Date: Tue, 3 Nov 2015 15:54:50 +0100 Subject: [PATCH] docs(contributing): Stop the develop branching strategy --- CONTRIBUTING.md | 13 ++++--------- lib/version.rb | 2 +- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7046d85..090a68a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -7,12 +7,12 @@ 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 `develop` -- Submit the PR on `develop` +- Create a local branch, starting from `master` +- Submit the PR on `master` - Wait for review - Do the changes requested (if any) -- We may ask you to rebase the branch to latest develop if it gets out of sync - with `develop` +- We may ask you to rebase the branch to latest master if it gets out of sync + with `master` - Receive the thanks of the Algolia team :) # Development workflow @@ -43,14 +43,9 @@ vim ./lib/version.rb git add ./lib/version.rb git commit -m 'chore(bump): Version bump to X.Y.Z' -# Merge develop into master -git checkout master -git rebase develop - # Tag and release rake release - # Install the gem locally rake install ``` diff --git a/lib/version.rb b/lib/version.rb index 3407980..f5a8658 100644 --- a/lib/version.rb +++ b/lib/version.rb @@ -2,7 +2,7 @@ class AlgoliaSearchJekyllVersion MAJOR = 0 MINOR = 5 - PATCH = 0 + PATCH = 1 BUILD = nil def self.to_s