From 12ed65f9e0c5f4d92cd8ed5ca476e5e32203c9c6 Mon Sep 17 00:00:00 2001 From: Vladimir Jimenez Date: Sun, 21 Jan 2018 00:28:19 -0800 Subject: [PATCH] Update branch notes in CONTRIBUTING [skip ci] --- CONTRIBUTING.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7d464ffb..33529313 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -61,9 +61,6 @@ Before tagging a new release, here are few things that need to be done. Eventual This project follows a Git Flow-like scheme for branch management. Any branches where new features are being developed should be prepended with `feature/`; however that's the only practice that has been adopted. -- **master** - This branch contains the current development version of BZiON. -- **0.10-stable** - This branch contains the latest stable `0.10.x` code. - - Hot fixes will go to this branch for quick releases. - - New releases will be merged into this branch from the `master` branch. +- **master** - This branch contains the current development version (`0.10.x`) of BZiON and should **always** be kept stable; features in development belong in their own feature branches. - **0.9** - This branch has been retired and contains the latest development version of the `0.9.x` pipeline. - **0.1** - This branch contains legacy code for a very early attempt of BZiON. This branch is only around for historical purposes.