From 61fe05167cf7fac6d2010560783a5cc86ba21cff Mon Sep 17 00:00:00 2001 From: Peter Epley Date: Wed, 25 Oct 2017 22:24:21 -0400 Subject: [PATCH 1/2] Update development_submitting.markdown Added notes helpful for comparing and requesting a pull (ex. to avoid proposing merge of dev and master accidentally). --- source/developers/development_submitting.markdown | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/source/developers/development_submitting.markdown b/source/developers/development_submitting.markdown index 5e3fea51afa2..4d57e81ed7cd 100644 --- a/source/developers/development_submitting.markdown +++ b/source/developers/development_submitting.markdown @@ -36,5 +36,12 @@ Submit your improvements, fixes, and new features to Home Assistant one at a tim 6. Follow [these steps](https://help.github.com/articles/creating-a-pull-request/) to create your pull request. + * On GitHub, navigate to the main page of the Home Assistant repository. + * In the "Branch" menu, choose the branch that contains your commits (from your fork). + * To the right of the Branch menu, click New pull request. + * Use the base branch dropdown menu to select the branch you'd like to merge your changes into, then use the compare branch drop-down menu to choose the topic branch you made your changes in. Make sure the Home Assistant branch matches with your forked branch (dev or master) else you will propose ALL committs between branches. + * Type a title and complete the provided description for your pull request. + * Click Create pull request. + 7. Check for comments and suggestions on your pull request and keep an eye on the [CI output](https://travis-ci.org/home-assistant/home-assistant/). From 05d103770baeff1ac705d4780ccde062cf34fadb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 26 Oct 2017 08:39:44 +0200 Subject: [PATCH 2/2] Update format --- source/developers/development_submitting.markdown | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/developers/development_submitting.markdown b/source/developers/development_submitting.markdown index 4d57e81ed7cd..919e20706b9f 100644 --- a/source/developers/development_submitting.markdown +++ b/source/developers/development_submitting.markdown @@ -38,10 +38,10 @@ Submit your improvements, fixes, and new features to Home Assistant one at a tim * On GitHub, navigate to the main page of the Home Assistant repository. * In the "Branch" menu, choose the branch that contains your commits (from your fork). - * To the right of the Branch menu, click New pull request. - * Use the base branch dropdown menu to select the branch you'd like to merge your changes into, then use the compare branch drop-down menu to choose the topic branch you made your changes in. Make sure the Home Assistant branch matches with your forked branch (dev or master) else you will propose ALL committs between branches. + * To the right of the Branch menu, click **New pull request**. + * Use the base branch dropdown menu to select the branch you'd like to merge your changes into, then use the compare branch drop-down menu to choose the topic branch you made your changes in. Make sure the Home Assistant branch matches with your forked branch (`dev`) else you will propose ALL committs between branches. * Type a title and complete the provided description for your pull request. - * Click Create pull request. + * Click **Create pull request**. 7. Check for comments and suggestions on your pull request and keep an eye on the [CI output](https://travis-ci.org/home-assistant/home-assistant/).