From 15cd12d27c952e96590df7722069d2395824ebc9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 11 Sep 2016 00:07:59 +0200 Subject: [PATCH] Fix branch name --- source/developers/releasing.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/developers/releasing.markdown b/source/developers/releasing.markdown index 17843777b13..d1d53f65e97 100644 --- a/source/developers/releasing.markdown +++ b/source/developers/releasing.markdown @@ -26,7 +26,7 @@ This page describes the steps for publishing a new Home Assistant release. 2. Create missing documentation as stumbs in `next`. 3. Update the link on the frontpage (`source/index.html`) to link to the new release blog post and version number. 4. Create a pull request from `next` to `current` with the upcoming release number as title. -5. Merge `current` into `next` (`$ git checkout next && git merge master`) to make the PR mergable. +5. Merge `current` into `next` (`$ git checkout next && git merge current`) to make the PR mergable. 6. Merge pull request (blog post, updated frontpage, and all new documentation) to `current`. ### {% linkable_title Python Package Index %}