Skip to content

Commit b97c40c

Browse files
balloobbotballoobbot
committed
Site updated at 2017-09-16 22:05:22 UTC
1 parent dfd794b commit b97c40c

File tree

26 files changed

+69
-64
lines changed

26 files changed

+69
-64
lines changed

‎atom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title><![CDATA[Home Assistant]]></title>
55
<link href="https://home-assistant.io/atom.xml" rel="self"/>
66
<link href="https://home-assistant.io/"/>
7-
<updated>2017-09-16T18:27:52+00:00</updated>
7+
<updated>2017-09-16T21:58:50+00:00</updated>
88
<id>https://home-assistant.io/</id>
99
<author>
1010
<name><![CDATA[Home Assistant]]></name>

‎blog/categories/announcements/atom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title><![CDATA[Category: Announcements | Home Assistant]]></title>
55
<link href="https://home-assistant.io/blog/categories/announcements/atom.xml" rel="self"/>
66
<link href="https://home-assistant.io/"/>
7-
<updated>2017-09-16T18:27:52+00:00</updated>
7+
<updated>2017-09-16T21:58:50+00:00</updated>
88
<id>https://home-assistant.io/</id>
99
<author>
1010
<name><![CDATA[Home Assistant]]></name>

‎blog/categories/community/atom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title><![CDATA[Category: Community | Home Assistant]]></title>
55
<link href="https://home-assistant.io/blog/categories/community/atom.xml" rel="self"/>
66
<link href="https://home-assistant.io/"/>
7-
<updated>2017-09-16T18:27:52+00:00</updated>
7+
<updated>2017-09-16T21:58:50+00:00</updated>
88
<id>https://home-assistant.io/</id>
99
<author>
1010
<name><![CDATA[Home Assistant]]></name>

‎blog/categories/device-tracking/atom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title><![CDATA[Category: Device-Tracking | Home Assistant]]></title>
55
<link href="https://home-assistant.io/blog/categories/device-tracking/atom.xml" rel="self"/>
66
<link href="https://home-assistant.io/"/>
7-
<updated>2017-09-16T18:27:52+00:00</updated>
7+
<updated>2017-09-16T21:58:50+00:00</updated>
88
<id>https://home-assistant.io/</id>
99
<author>
1010
<name><![CDATA[Home Assistant]]></name>

‎blog/categories/esp8266/atom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title><![CDATA[Category: ESP8266 | Home Assistant]]></title>
55
<link href="https://home-assistant.io/blog/categories/esp8266/atom.xml" rel="self"/>
66
<link href="https://home-assistant.io/"/>
7-
<updated>2017-09-16T18:27:52+00:00</updated>
7+
<updated>2017-09-16T21:58:50+00:00</updated>
88
<id>https://home-assistant.io/</id>
99
<author>
1010
<name><![CDATA[Home Assistant]]></name>

‎blog/categories/how-to/atom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title><![CDATA[Category: How-To | Home Assistant]]></title>
55
<link href="https://home-assistant.io/blog/categories/how-to/atom.xml" rel="self"/>
66
<link href="https://home-assistant.io/"/>
7-
<updated>2017-09-16T18:27:52+00:00</updated>
7+
<updated>2017-09-16T21:58:50+00:00</updated>
88
<id>https://home-assistant.io/</id>
99
<author>
1010
<name><![CDATA[Home Assistant]]></name>

‎blog/categories/ibeacons/atom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title><![CDATA[Category: iBeacons | Home Assistant]]></title>
55
<link href="https://home-assistant.io/blog/categories/ibeacons/atom.xml" rel="self"/>
66
<link href="https://home-assistant.io/"/>
7-
<updated>2017-09-16T18:27:52+00:00</updated>
7+
<updated>2017-09-16T21:58:50+00:00</updated>
88
<id>https://home-assistant.io/</id>
99
<author>
1010
<name><![CDATA[Home Assistant]]></name>

‎blog/categories/internet-of-things/atom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title><![CDATA[Category: Internet-of-Things | Home Assistant]]></title>
55
<link href="https://home-assistant.io/blog/categories/internet-of-things/atom.xml" rel="self"/>
66
<link href="https://home-assistant.io/"/>
7-
<updated>2017-09-16T18:27:52+00:00</updated>
7+
<updated>2017-09-16T21:58:50+00:00</updated>
88
<id>https://home-assistant.io/</id>
99
<author>
1010
<name><![CDATA[Home Assistant]]></name>

‎blog/categories/iot-data/atom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title><![CDATA[Category: IoT-Data | Home Assistant]]></title>
55
<link href="https://home-assistant.io/blog/categories/iot-data/atom.xml" rel="self"/>
66
<link href="https://home-assistant.io/"/>
7-
<updated>2017-09-16T18:27:52+00:00</updated>
7+
<updated>2017-09-16T21:58:50+00:00</updated>
88
<id>https://home-assistant.io/</id>
99
<author>
1010
<name><![CDATA[Home Assistant]]></name>

‎blog/categories/media/atom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title><![CDATA[Category: Media | Home Assistant]]></title>
55
<link href="https://home-assistant.io/blog/categories/media/atom.xml" rel="self"/>
66
<link href="https://home-assistant.io/"/>
7-
<updated>2017-09-16T18:27:52+00:00</updated>
7+
<updated>2017-09-16T21:58:50+00:00</updated>
88
<id>https://home-assistant.io/</id>
99
<author>
1010
<name><![CDATA[Home Assistant]]></name>

‎blog/categories/merchandise/atom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title><![CDATA[Category: Merchandise | Home Assistant]]></title>
55
<link href="https://home-assistant.io/blog/categories/merchandise/atom.xml" rel="self"/>
66
<link href="https://home-assistant.io/"/>
7-
<updated>2017-09-16T18:27:52+00:00</updated>
7+
<updated>2017-09-16T21:58:50+00:00</updated>
88
<id>https://home-assistant.io/</id>
99
<author>
1010
<name><![CDATA[Home Assistant]]></name>

‎blog/categories/micropython/atom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title><![CDATA[Category: Micropython | Home Assistant]]></title>
55
<link href="https://home-assistant.io/blog/categories/micropython/atom.xml" rel="self"/>
66
<link href="https://home-assistant.io/"/>
7-
<updated>2017-09-16T18:27:52+00:00</updated>
7+
<updated>2017-09-16T21:58:50+00:00</updated>
88
<id>https://home-assistant.io/</id>
99
<author>
1010
<name><![CDATA[Home Assistant]]></name>

‎blog/categories/mqtt/atom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title><![CDATA[Category: MQTT | Home Assistant]]></title>
55
<link href="https://home-assistant.io/blog/categories/mqtt/atom.xml" rel="self"/>
66
<link href="https://home-assistant.io/"/>
7-
<updated>2017-09-16T18:27:52+00:00</updated>
7+
<updated>2017-09-16T21:58:50+00:00</updated>
88
<id>https://home-assistant.io/</id>
99
<author>
1010
<name><![CDATA[Home Assistant]]></name>

‎blog/categories/organisation/atom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title><![CDATA[Category: Organisation | Home Assistant]]></title>
55
<link href="https://home-assistant.io/blog/categories/organisation/atom.xml" rel="self"/>
66
<link href="https://home-assistant.io/"/>
7-
<updated>2017-09-16T18:27:52+00:00</updated>
7+
<updated>2017-09-16T21:58:50+00:00</updated>
88
<id>https://home-assistant.io/</id>
99
<author>
1010
<name><![CDATA[Home Assistant]]></name>

‎blog/categories/owntracks/atom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title><![CDATA[Category: OwnTracks | Home Assistant]]></title>
55
<link href="https://home-assistant.io/blog/categories/owntracks/atom.xml" rel="self"/>
66
<link href="https://home-assistant.io/"/>
7-
<updated>2017-09-16T18:27:52+00:00</updated>
7+
<updated>2017-09-16T21:58:50+00:00</updated>
88
<id>https://home-assistant.io/</id>
99
<author>
1010
<name><![CDATA[Home Assistant]]></name>

‎blog/categories/presence-detection/atom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title><![CDATA[Category: Presence-Detection | Home Assistant]]></title>
55
<link href="https://home-assistant.io/blog/categories/presence-detection/atom.xml" rel="self"/>
66
<link href="https://home-assistant.io/"/>
7-
<updated>2017-09-16T18:27:52+00:00</updated>
7+
<updated>2017-09-16T21:58:50+00:00</updated>
88
<id>https://home-assistant.io/</id>
99
<author>
1010
<name><![CDATA[Home Assistant]]></name>

‎blog/categories/public-service-announcement/atom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title><![CDATA[Category: Public-Service-Announcement | Home Assistant]]></title>
55
<link href="https://home-assistant.io/blog/categories/public-service-announcement/atom.xml" rel="self"/>
66
<link href="https://home-assistant.io/"/>
7-
<updated>2017-09-16T18:27:52+00:00</updated>
7+
<updated>2017-09-16T21:58:50+00:00</updated>
88
<id>https://home-assistant.io/</id>
99
<author>
1010
<name><![CDATA[Home Assistant]]></name>

‎blog/categories/release-notes/atom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title><![CDATA[Category: Release-Notes | Home Assistant]]></title>
55
<link href="https://home-assistant.io/blog/categories/release-notes/atom.xml" rel="self"/>
66
<link href="https://home-assistant.io/"/>
7-
<updated>2017-09-16T18:27:52+00:00</updated>
7+
<updated>2017-09-16T21:58:50+00:00</updated>
88
<id>https://home-assistant.io/</id>
99
<author>
1010
<name><![CDATA[Home Assistant]]></name>

‎blog/categories/survey/atom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title><![CDATA[Category: Survey | Home Assistant]]></title>
55
<link href="https://home-assistant.io/blog/categories/survey/atom.xml" rel="self"/>
66
<link href="https://home-assistant.io/"/>
7-
<updated>2017-09-16T18:27:52+00:00</updated>
7+
<updated>2017-09-16T21:58:50+00:00</updated>
88
<id>https://home-assistant.io/</id>
99
<author>
1010
<name><![CDATA[Home Assistant]]></name>

‎blog/categories/talks/atom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title><![CDATA[Category: Talks | Home Assistant]]></title>
55
<link href="https://home-assistant.io/blog/categories/talks/atom.xml" rel="self"/>
66
<link href="https://home-assistant.io/"/>
7-
<updated>2017-09-16T18:27:52+00:00</updated>
7+
<updated>2017-09-16T21:58:50+00:00</updated>
88
<id>https://home-assistant.io/</id>
99
<author>
1010
<name><![CDATA[Home Assistant]]></name>

‎blog/categories/technology/atom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title><![CDATA[Category: Technology | Home Assistant]]></title>
55
<link href="https://home-assistant.io/blog/categories/technology/atom.xml" rel="self"/>
66
<link href="https://home-assistant.io/"/>
7-
<updated>2017-09-16T18:27:52+00:00</updated>
7+
<updated>2017-09-16T21:58:50+00:00</updated>
88
<id>https://home-assistant.io/</id>
99
<author>
1010
<name><![CDATA[Home Assistant]]></name>

‎blog/categories/user-stories/atom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title><![CDATA[Category: User-Stories | Home Assistant]]></title>
55
<link href="https://home-assistant.io/blog/categories/user-stories/atom.xml" rel="self"/>
66
<link href="https://home-assistant.io/"/>
7-
<updated>2017-09-16T18:27:52+00:00</updated>
7+
<updated>2017-09-16T21:58:50+00:00</updated>
88
<id>https://home-assistant.io/</id>
99
<author>
1010
<name><![CDATA[Home Assistant]]></name>

‎blog/categories/video/atom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title><![CDATA[Category: Video | Home Assistant]]></title>
55
<link href="https://home-assistant.io/blog/categories/video/atom.xml" rel="self"/>
66
<link href="https://home-assistant.io/"/>
7-
<updated>2017-09-16T18:27:52+00:00</updated>
7+
<updated>2017-09-16T21:58:50+00:00</updated>
88
<id>https://home-assistant.io/</id>
99
<author>
1010
<name><![CDATA[Home Assistant]]></name>

‎blog/categories/website/atom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title><![CDATA[Category: Website | Home Assistant]]></title>
55
<link href="https://home-assistant.io/blog/categories/website/atom.xml" rel="self"/>
66
<link href="https://home-assistant.io/"/>
7-
<updated>2017-09-16T18:27:52+00:00</updated>
7+
<updated>2017-09-16T21:58:50+00:00</updated>
88
<id>https://home-assistant.io/</id>
99
<author>
1010
<name><![CDATA[Home Assistant]]></name>

‎developers/development_catching_up/index.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,11 @@ <h1 class="title indent">
8787
<li>Continue rebase: <code class="highlighter-rouge">git rebase --continue</code></li>
8888
<li>Repeat until you’ve resolved all conflicts</li>
8989
</ol>
90+
<p>After rebasing your branch, you will have rewritten history relative to your GitHub fork’s branch. When you go to push you will see an error that your history has diverged from the original branch. In order to get your GitHub fork up-to-date with your local branch, you will need to force push, using the following command:</p>
91+
<div class="language-bash highlighter-rouge"><pre class="highlight"><code><span class="c"># Run this from your feature branch</span>
92+
<span class="gp">$ </span>git push origin --force
93+
</code></pre>
94+
</div>
9095
<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>
9196
<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
9297
</code></pre>

0 commit comments

Comments
 (0)