Site updated at 2016-10-04 20:28:08 UTC
This commit is contained in:
Travis CI
parent
3b9c663df3
commit
ad35531f76
23 changed files with 44 additions and 45 deletions
2
atom.xml
2
atom.xml
|
|
@ -4,7 +4,7 @@
|
|||
<title><![CDATA[Home Assistant]]></title>
|
||||
<link href="https://home-assistant.io/atom.xml" rel="self"/>
|
||||
<link href="https://home-assistant.io/"/>
|
||||
<updated>2016-10-04T20:09:01+00:00</updated>
|
||||
<updated>2016-10-04T20:26:23+00:00</updated>
|
||||
<id>https://home-assistant.io/</id>
|
||||
<author>
|
||||
<name><![CDATA[Home Assistant]]></name>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<title><![CDATA[Category: Community | Home Assistant]]></title>
|
||||
<link href="https://home-assistant.io/blog/categories/community/atom.xml" rel="self"/>
|
||||
<link href="https://home-assistant.io/"/>
|
||||
<updated>2016-10-04T20:09:01+00:00</updated>
|
||||
<updated>2016-10-04T20:26:23+00:00</updated>
|
||||
<id>https://home-assistant.io/</id>
|
||||
<author>
|
||||
<name><![CDATA[Home Assistant]]></name>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<title><![CDATA[Category: Device-Tracking | Home Assistant]]></title>
|
||||
<link href="https://home-assistant.io/blog/categories/device-tracking/atom.xml" rel="self"/>
|
||||
<link href="https://home-assistant.io/"/>
|
||||
<updated>2016-10-04T20:09:01+00:00</updated>
|
||||
<updated>2016-10-04T20:26:23+00:00</updated>
|
||||
<id>https://home-assistant.io/</id>
|
||||
<author>
|
||||
<name><![CDATA[Home Assistant]]></name>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<title><![CDATA[Category: ESP8266 | Home Assistant]]></title>
|
||||
<link href="https://home-assistant.io/blog/categories/esp8266/atom.xml" rel="self"/>
|
||||
<link href="https://home-assistant.io/"/>
|
||||
<updated>2016-10-04T20:09:01+00:00</updated>
|
||||
<updated>2016-10-04T20:26:23+00:00</updated>
|
||||
<id>https://home-assistant.io/</id>
|
||||
<author>
|
||||
<name><![CDATA[Home Assistant]]></name>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<title><![CDATA[Category: How-To | Home Assistant]]></title>
|
||||
<link href="https://home-assistant.io/blog/categories/how-to/atom.xml" rel="self"/>
|
||||
<link href="https://home-assistant.io/"/>
|
||||
<updated>2016-10-04T20:09:01+00:00</updated>
|
||||
<updated>2016-10-04T20:26:23+00:00</updated>
|
||||
<id>https://home-assistant.io/</id>
|
||||
<author>
|
||||
<name><![CDATA[Home Assistant]]></name>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<title><![CDATA[Category: iBeacons | Home Assistant]]></title>
|
||||
<link href="https://home-assistant.io/blog/categories/ibeacons/atom.xml" rel="self"/>
|
||||
<link href="https://home-assistant.io/"/>
|
||||
<updated>2016-10-04T20:09:01+00:00</updated>
|
||||
<updated>2016-10-04T20:26:23+00:00</updated>
|
||||
<id>https://home-assistant.io/</id>
|
||||
<author>
|
||||
<name><![CDATA[Home Assistant]]></name>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<title><![CDATA[Category: Internet-of-Things | Home Assistant]]></title>
|
||||
<link href="https://home-assistant.io/blog/categories/internet-of-things/atom.xml" rel="self"/>
|
||||
<link href="https://home-assistant.io/"/>
|
||||
<updated>2016-10-04T20:09:01+00:00</updated>
|
||||
<updated>2016-10-04T20:26:23+00:00</updated>
|
||||
<id>https://home-assistant.io/</id>
|
||||
<author>
|
||||
<name><![CDATA[Home Assistant]]></name>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<title><![CDATA[Category: IoT-Data | Home Assistant]]></title>
|
||||
<link href="https://home-assistant.io/blog/categories/iot-data/atom.xml" rel="self"/>
|
||||
<link href="https://home-assistant.io/"/>
|
||||
<updated>2016-10-04T20:09:01+00:00</updated>
|
||||
<updated>2016-10-04T20:26:23+00:00</updated>
|
||||
<id>https://home-assistant.io/</id>
|
||||
<author>
|
||||
<name><![CDATA[Home Assistant]]></name>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<title><![CDATA[Category: Micropython | Home Assistant]]></title>
|
||||
<link href="https://home-assistant.io/blog/categories/micropython/atom.xml" rel="self"/>
|
||||
<link href="https://home-assistant.io/"/>
|
||||
<updated>2016-10-04T20:09:01+00:00</updated>
|
||||
<updated>2016-10-04T20:26:23+00:00</updated>
|
||||
<id>https://home-assistant.io/</id>
|
||||
<author>
|
||||
<name><![CDATA[Home Assistant]]></name>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<title><![CDATA[Category: MQTT | Home Assistant]]></title>
|
||||
<link href="https://home-assistant.io/blog/categories/mqtt/atom.xml" rel="self"/>
|
||||
<link href="https://home-assistant.io/"/>
|
||||
<updated>2016-10-04T20:09:01+00:00</updated>
|
||||
<updated>2016-10-04T20:26:23+00:00</updated>
|
||||
<id>https://home-assistant.io/</id>
|
||||
<author>
|
||||
<name><![CDATA[Home Assistant]]></name>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<title><![CDATA[Category: Organisation | Home Assistant]]></title>
|
||||
<link href="https://home-assistant.io/blog/categories/organisation/atom.xml" rel="self"/>
|
||||
<link href="https://home-assistant.io/"/>
|
||||
<updated>2016-10-04T20:09:01+00:00</updated>
|
||||
<updated>2016-10-04T20:26:23+00:00</updated>
|
||||
<id>https://home-assistant.io/</id>
|
||||
<author>
|
||||
<name><![CDATA[Home Assistant]]></name>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<title><![CDATA[Category: OwnTracks | Home Assistant]]></title>
|
||||
<link href="https://home-assistant.io/blog/categories/owntracks/atom.xml" rel="self"/>
|
||||
<link href="https://home-assistant.io/"/>
|
||||
<updated>2016-10-04T20:09:01+00:00</updated>
|
||||
<updated>2016-10-04T20:26:23+00:00</updated>
|
||||
<id>https://home-assistant.io/</id>
|
||||
<author>
|
||||
<name><![CDATA[Home Assistant]]></name>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<title><![CDATA[Category: Presence-Detection | Home Assistant]]></title>
|
||||
<link href="https://home-assistant.io/blog/categories/presence-detection/atom.xml" rel="self"/>
|
||||
<link href="https://home-assistant.io/"/>
|
||||
<updated>2016-10-04T20:09:01+00:00</updated>
|
||||
<updated>2016-10-04T20:26:23+00:00</updated>
|
||||
<id>https://home-assistant.io/</id>
|
||||
<author>
|
||||
<name><![CDATA[Home Assistant]]></name>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<title><![CDATA[Category: Public-Service-Announcement | Home Assistant]]></title>
|
||||
<link href="https://home-assistant.io/blog/categories/public-service-announcement/atom.xml" rel="self"/>
|
||||
<link href="https://home-assistant.io/"/>
|
||||
<updated>2016-10-04T20:09:01+00:00</updated>
|
||||
<updated>2016-10-04T20:26:23+00:00</updated>
|
||||
<id>https://home-assistant.io/</id>
|
||||
<author>
|
||||
<name><![CDATA[Home Assistant]]></name>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<title><![CDATA[Category: Release-Notes | Home Assistant]]></title>
|
||||
<link href="https://home-assistant.io/blog/categories/release-notes/atom.xml" rel="self"/>
|
||||
<link href="https://home-assistant.io/"/>
|
||||
<updated>2016-10-04T20:09:01+00:00</updated>
|
||||
<updated>2016-10-04T20:26:23+00:00</updated>
|
||||
<id>https://home-assistant.io/</id>
|
||||
<author>
|
||||
<name><![CDATA[Home Assistant]]></name>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<title><![CDATA[Category: Survey | Home Assistant]]></title>
|
||||
<link href="https://home-assistant.io/blog/categories/survey/atom.xml" rel="self"/>
|
||||
<link href="https://home-assistant.io/"/>
|
||||
<updated>2016-10-04T20:09:01+00:00</updated>
|
||||
<updated>2016-10-04T20:26:23+00:00</updated>
|
||||
<id>https://home-assistant.io/</id>
|
||||
<author>
|
||||
<name><![CDATA[Home Assistant]]></name>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<title><![CDATA[Category: Talks | Home Assistant]]></title>
|
||||
<link href="https://home-assistant.io/blog/categories/talks/atom.xml" rel="self"/>
|
||||
<link href="https://home-assistant.io/"/>
|
||||
<updated>2016-10-04T20:09:01+00:00</updated>
|
||||
<updated>2016-10-04T20:26:23+00:00</updated>
|
||||
<id>https://home-assistant.io/</id>
|
||||
<author>
|
||||
<name><![CDATA[Home Assistant]]></name>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<title><![CDATA[Category: Technology | Home Assistant]]></title>
|
||||
<link href="https://home-assistant.io/blog/categories/technology/atom.xml" rel="self"/>
|
||||
<link href="https://home-assistant.io/"/>
|
||||
<updated>2016-10-04T20:09:01+00:00</updated>
|
||||
<updated>2016-10-04T20:26:23+00:00</updated>
|
||||
<id>https://home-assistant.io/</id>
|
||||
<author>
|
||||
<name><![CDATA[Home Assistant]]></name>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<title><![CDATA[Category: User-Stories | Home Assistant]]></title>
|
||||
<link href="https://home-assistant.io/blog/categories/user-stories/atom.xml" rel="self"/>
|
||||
<link href="https://home-assistant.io/"/>
|
||||
<updated>2016-10-04T20:09:01+00:00</updated>
|
||||
<updated>2016-10-04T20:26:23+00:00</updated>
|
||||
<id>https://home-assistant.io/</id>
|
||||
<author>
|
||||
<name><![CDATA[Home Assistant]]></name>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<title><![CDATA[Category: Video | Home Assistant]]></title>
|
||||
<link href="https://home-assistant.io/blog/categories/video/atom.xml" rel="self"/>
|
||||
<link href="https://home-assistant.io/"/>
|
||||
<updated>2016-10-04T20:09:01+00:00</updated>
|
||||
<updated>2016-10-04T20:26:23+00:00</updated>
|
||||
<id>https://home-assistant.io/</id>
|
||||
<author>
|
||||
<name><![CDATA[Home Assistant]]></name>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<title><![CDATA[Category: Website | Home Assistant]]></title>
|
||||
<link href="https://home-assistant.io/blog/categories/website/atom.xml" rel="self"/>
|
||||
<link href="https://home-assistant.io/"/>
|
||||
<updated>2016-10-04T20:09:01+00:00</updated>
|
||||
<updated>2016-10-04T20:26:23+00:00</updated>
|
||||
<id>https://home-assistant.io/</id>
|
||||
<author>
|
||||
<name><![CDATA[Home Assistant]]></name>
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@
|
|||
<hr class="divider">
|
||||
|
||||
|
||||
<p>If you’re taking a while developing your feature and would like to catch up with what’s in the current Home Assistant <code class="highlighter-rouge">dev</code> branch, you can use <code class="highlighter-rouge">git rebase</code> to do so. This will pull the latest Home Assistant changes locally, rewind your commits, bring in the latest changes from Home Assistant and then replay all of your commits on top.</p>
|
||||
<p>If it’s taking a while to develop your feature, and you want to catch up with what’s in the current Home Assistant <code class="highlighter-rouge">dev</code> branch, you can use <code class="highlighter-rouge">git rebase</code>. This will pull the latest Home Assistant changes locally, rewind your commits, bring in the latest changes from Home Assistant, and replay all of your commits on top.</p>
|
||||
|
||||
<div class="language-bash highlighter-rouge"><pre class="highlight"><code><span class="c"># Run this from your feature branch</span>
|
||||
<span class="gp">$ </span>git fetch upstream dev <span class="c"># to pull the latest changes into a local dev branch</span>
|
||||
|
|
@ -97,23 +97,22 @@
|
|||
</code></pre>
|
||||
</div>
|
||||
|
||||
<p>If rebase detects conflicts, you can repeat the following process until all changes have been resolved:</p>
|
||||
<p>If rebase detects conflicts, repeat this process until all changes have been resolved:</p>
|
||||
|
||||
<ol>
|
||||
<li><code class="highlighter-rouge">git status</code> will show you the file with the conflict.</li>
|
||||
<li>Edit the file and resolving the lines between <code class="highlighter-rouge"><<<< | >>>></code></li>
|
||||
<li>Add the modified file <code class="highlighter-rouge">git add <file></code> or <code class="highlighter-rouge">git add .</code></li>
|
||||
<li>Continue rebase <code class="highlighter-rouge">git rebase --continue</code></li>
|
||||
<li>Repeat until you’ve resolved all conflicts.</li>
|
||||
<li><code class="highlighter-rouge">git status</code> shows you the file with the conflict; edit the file and resolve the lines between <code class="highlighter-rouge"><<<< | >>>></code></li>
|
||||
<li>Add the modified file: <code class="highlighter-rouge">git add <file></code> or <code class="highlighter-rouge">git add .</code></li>
|
||||
<li>Continue rebase: <code class="highlighter-rouge">git rebase --continue</code></li>
|
||||
<li>Repeat until you’ve resolved all conflicts</li>
|
||||
</ol>
|
||||
|
||||
<p>There is other workflows that is covered in detail in the <a href="https://help.github.com/articles/fork-a-repo/">Github documentation</a>. Add an additional <code class="highlighter-rouge">remote</code> after you clone your fork.</p>
|
||||
<p>Other workflows are covered in detail in the <a href="https://help.github.com/articles/fork-a-repo/">Github documentation</a>. Add an additional <code class="highlighter-rouge">remote</code> after you clone your fork.</p>
|
||||
|
||||
<div class="language-bash highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>git remote add upstream https://github.com/home-assistant/home-assistant.git
|
||||
</code></pre>
|
||||
</div>
|
||||
|
||||
<p>and then simply <code class="highlighter-rouge">git pull --rebase upstream dev</code>.</p>
|
||||
<p>Then, <code class="highlighter-rouge">git pull --rebase upstream dev</code>.</p>
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
30
sitemap.xml
30
sitemap.xml
|
|
@ -2113,62 +2113,62 @@
|
|||
</url>
|
||||
<url>
|
||||
<loc>https://home-assistant.io/demo/frontend.html</loc>
|
||||
<lastmod>2016-10-04T20:08:12+00:00</lastmod>
|
||||
<lastmod>2016-10-04T20:25:43+00:00</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://home-assistant.io/demo/index.html</loc>
|
||||
<lastmod>2016-10-04T20:08:12+00:00</lastmod>
|
||||
<lastmod>2016-10-04T20:25:43+00:00</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://home-assistant.io/demo/panels/ha-panel-dev-event.html</loc>
|
||||
<lastmod>2016-10-04T20:08:12+00:00</lastmod>
|
||||
<lastmod>2016-10-04T20:25:43+00:00</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://home-assistant.io/demo/panels/ha-panel-dev-info.html</loc>
|
||||
<lastmod>2016-10-04T20:08:12+00:00</lastmod>
|
||||
<lastmod>2016-10-04T20:25:43+00:00</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://home-assistant.io/demo/panels/ha-panel-dev-service.html</loc>
|
||||
<lastmod>2016-10-04T20:08:12+00:00</lastmod>
|
||||
<lastmod>2016-10-04T20:25:43+00:00</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://home-assistant.io/demo/panels/ha-panel-dev-state.html</loc>
|
||||
<lastmod>2016-10-04T20:08:12+00:00</lastmod>
|
||||
<lastmod>2016-10-04T20:25:43+00:00</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://home-assistant.io/demo/panels/ha-panel-dev-template.html</loc>
|
||||
<lastmod>2016-10-04T20:08:12+00:00</lastmod>
|
||||
<lastmod>2016-10-04T20:25:43+00:00</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://home-assistant.io/demo/panels/ha-panel-history.html</loc>
|
||||
<lastmod>2016-10-04T20:08:12+00:00</lastmod>
|
||||
<lastmod>2016-10-04T20:25:43+00:00</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://home-assistant.io/demo/panels/ha-panel-iframe.html</loc>
|
||||
<lastmod>2016-10-04T20:08:12+00:00</lastmod>
|
||||
<lastmod>2016-10-04T20:25:43+00:00</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://home-assistant.io/demo/panels/ha-panel-logbook.html</loc>
|
||||
<lastmod>2016-10-04T20:08:12+00:00</lastmod>
|
||||
<lastmod>2016-10-04T20:25:43+00:00</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://home-assistant.io/demo/panels/ha-panel-map.html</loc>
|
||||
<lastmod>2016-10-04T20:08:12+00:00</lastmod>
|
||||
<lastmod>2016-10-04T20:25:43+00:00</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://home-assistant.io/googlef4f3693c209fe788.html</loc>
|
||||
<lastmod>2016-10-04T20:08:12+00:00</lastmod>
|
||||
<lastmod>2016-10-04T20:25:43+00:00</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://home-assistant.io/static/fonts/roboto/DESCRIPTION.en_us.html</loc>
|
||||
<lastmod>2016-10-04T20:08:12+00:00</lastmod>
|
||||
<lastmod>2016-10-04T20:25:43+00:00</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://home-assistant.io/static/fonts/robotomono/DESCRIPTION.en_us.html</loc>
|
||||
<lastmod>2016-10-04T20:08:12+00:00</lastmod>
|
||||
<lastmod>2016-10-04T20:25:43+00:00</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://home-assistant.io/static/mdi-demo.html</loc>
|
||||
<lastmod>2016-10-04T20:08:12+00:00</lastmod>
|
||||
<lastmod>2016-10-04T20:25:43+00:00</lastmod>
|
||||
</url>
|
||||
</urlset>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue