jeena/home-assistant.github.io
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Site updated at 2016-10-04 20:28:08 UTC

Browse source
This commit is contained in:
Travis CI 2016-10-04 20:28:08 +00:00
parent 3b9c663df3
commit ad35531f76
23 changed files with 44 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

17
developers/development_catching_up/index.html
View file

@ -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">&lt;&lt;&lt;&lt; | &gt;&gt;&gt;&gt;</code></li>
<li>Add the modified file <code class="highlighter-rouge">git add &lt;file&gt;</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">&lt;&lt;&lt;&lt; | &gt;&gt;&gt;&gt;</code></li>
<li>Add the modified file: <code class="highlighter-rouge">git add &lt;file&gt;</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>