From d714badf5afd06231f47dea85cde489c1136589d Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 4 Oct 2016 11:18:51 -0700 Subject: [PATCH 1/2] explicitly call out 'dev' branch Clearly call out that new work should branch off of 'dev' branch. --- source/developers/development_submitting.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/developers/development_submitting.markdown b/source/developers/development_submitting.markdown index 8843ef45fb4..0801af11c56 100644 --- a/source/developers/development_submitting.markdown +++ b/source/developers/development_submitting.markdown @@ -11,7 +11,7 @@ footer: true Improvements, fixes, and new features to Home Assistant should be submitted one feature at a time using GitHub [Pull Requests](https://help.github.com/articles/using-pull-requests). - 1. From your fork, create a new branch to hold your changes + 1. From your fork's dev branch, create a new branch to hold your changes `git checkout -b some-feature` 2. Make the changes you want, create a [new platform](/developers/add_new_platform/), develop a [new component](/developers/creating_components/), or fix [issues](https://github.com/home-assistant/home-assistant/issues). 3. [Test your changes](/developers/development_testing/) and check for style violations From 7b838c6e682ba873adc19e1f77991a8b4026a46d Mon Sep 17 00:00:00 2001 From: Robbie Trencheny Date: Tue, 4 Oct 2016 15:11:16 -0700 Subject: [PATCH 2/2] Fix merge conflict --- .../development_submitting.markdown | 31 +++++++++++++------ 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/source/developers/development_submitting.markdown b/source/developers/development_submitting.markdown index 0801af11c56..58e60ca5137 100644 --- a/source/developers/development_submitting.markdown +++ b/source/developers/development_submitting.markdown @@ -9,18 +9,29 @@ sharing: true footer: true --- -Improvements, fixes, and new features to Home Assistant should be submitted one feature at a time using GitHub [Pull Requests](https://help.github.com/articles/using-pull-requests). +Submit your improvements, fixes, and new features to Home Assistant one at a time, using GitHub [Pull Requests](https://help.github.com/articles/using-pull-requests). Here are the steps: - 1. From your fork's dev branch, create a new branch to hold your changes - `git checkout -b some-feature` - 2. Make the changes you want, create a [new platform](/developers/add_new_platform/), develop a [new component](/developers/creating_components/), or fix [issues](https://github.com/home-assistant/home-assistant/issues). - 3. [Test your changes](/developers/development_testing/) and check for style violations - 4. Commit the changes if all [musts](/developers/development_checklist/) are covered. + 1. From your fork's dev branch, create a new branch to hold your changes: + + `git checkout -b some-feature` + + 2. Make your changes, create a [new platform](/developers/add_new_platform/), develop a [new component](/developers/creating_components/), or fix [issues](https://github.com/home-assistant/home-assistant/issues). + + 3. [Test your changes](/developers/development_testing/) and check for style violations. + + 4. If everything looks good according to these [musts](/developers/development_checklist/), commit your changes: + `git add .` + `git commit -m "Added some-feature"` - 5. Consider to add tests to ensure that the code works. - 6. Push your committed changes back to your fork on GitHub + + * Consider adding tests to ensure that your code works. + + 5. Push your committed changes back to your fork on GitHub: + `git push origin HEAD` - 7. Follow [these steps](https://help.github.com/articles/creating-a-pull-request/) to create your pull request. - 8. 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/). + + 6. Follow [these steps](https://help.github.com/articles/creating-a-pull-request/) to create your 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/).