From 92e455e965e2a68741218ca9b10162b70e45ffa2 Mon Sep 17 00:00:00 2001 From: Rob Giseburt Date: Tue, 21 Nov 2017 14:55:10 -0600 Subject: [PATCH] Update README.md --- README.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 85e41dd7..40f53dee 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,12 @@ g2core -[![Build Status](https://travis-ci.org/synthetos/g2.svg?branch=edge)](https://travis-ci.org/synthetos/g2) [![Issues in Ready](https://badge.waffle.io/synthetos/g2.svg?label=ready&title=Ready)](http://waffle.io/synthetos/g2) [![Issues in Progress](https://badge.waffle.io/synthetos/g2.svg?label=in%20progress&title=In%20Progress)](http://waffle.io/synthetos/g2) +[![Build Status](https://travis-ci.org/synthetos/g2.svg?branch=master)](https://travis-ci.org/synthetos/g2) [![Issues in Ready](https://badge.waffle.io/synthetos/g2.svg?label=ready&title=Ready)](http://waffle.io/synthetos/g2) [![Issues in Progress](https://badge.waffle.io/synthetos/g2.svg?label=in%20progress&title=In%20Progress)](http://waffle.io/synthetos/g2) -# g2core - Edge Branch +# g2core - Master Branch -G2 [Edge](https://github.com/synthetos/g2/tree/edge) is the branch for beta testing new features under development. New features are developed in feature branches and merged into the edge branch. Periodically edge is promoted to master. - -That said, Edge is for the adventurous. It is not guaranteed to be stable, but we do our best to achieve this. For production uses we recommend using the [Master branch](https://github.com/synthetos/g2/tree/master). +g2core [master](https://github.com/synthetos/g2/tree/master) is the stable branch. New features are developed in feature branches and merged into the edge branch, and after thorough testing are merged here to master. +For production uses we recommend using this [master branch](https://github.com/synthetos/g2/tree/master). For the adventurous (or developers wishing to lend a hand), we have the [edge branch](https://github.com/synthetos/g2/tree/edge). It is not guaranteed to be stable, but we do our best to achieve this. ## Firmware Build 100 `{fb:100.xx}` ### Feature Enhancements