From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 16 May 2014 19:43:04 +0000 (-0300)
Subject: Release workflow with git-flow
X-Git-Tag: 0.3.4~1^2~1
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=79a87b0e7536299ba49b559e8bcdd0c96291f413;p=keyringer.git

Release workflow with git-flow
---

diff --git a/development.mdwn b/development.mdwn
index 91ddc87..67c6456 100644
--- a/development.mdwn
+++ b/development.mdwn
@@ -52,9 +52,10 @@ We use [git-flow](https://github.com/nvie/gitflow) for the development workflow.
 Release workflow
 ----------------
 
-Go to master branch
+Go to develop branch and start a new release
 
-    git checkout master
+    git checkout develop
+    git flow release start VERSION
 
 Prepare the source code:
 
@@ -64,6 +65,8 @@ Prepare the source code:
 
 Create and upload a new release:
 
+    git flow release finish $VERSION
+    git checkout master
     make release
 
 Update the debian branch: