Skip to content

Commit

Permalink
little d
Browse files Browse the repository at this point in the history
  • Loading branch information
Jessica Lord committed Jan 30, 2015
1 parent b476f49 commit 890b224
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions guide/challenges-zhtw/merge_tada.html
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ <h2>&#x6B65;&#x9A5F;&#xFF1A;&#x5F9E;&#x672C;&#x6A5F; <v><span class="superscript
<p><code>$ git merge &lt;BRANCHNAME&gt;</code></p>

<p>&#x6574;&#x7406;&#x4E00;&#x4E0B;&#x5427;&#xFF0C;&#x73FE;&#x5728;&#x628A;&#x525B;&#x525B;&#x5DF2;&#x7D93; <v><span class="superscript">&#x5408;&#x4F75;</span>merged</v> &#x7684; <n><span class="superscript">&#x529F;&#x80FD;</span>feature</n> <n><span class="superscript">&#x5206;&#x652F;</span>branch</n> &#x522A;&#x6389;&#x3002;</p>
<p><code>$ git branch -D &lt;BRANCHNAME&gt;</code></p>
<p><code>$ git branch -d &lt;BRANCHNAME&gt;</code></p>

<p>&#x4E5F;&#x53EF;&#x4EE5;&#x628A; <n><span class="superscript">&#x5206;&#x652F;</span>branch</n> &#x5F9E; GitHub &#x4E0A;&#x7684; <adj><span class="superscript">&#x8907;&#x672C;&#x7684;</span>forked</adj> <n><span class="superscript">&#x7A0B;&#x5F0F;&#x5EAB;</span>repository</n> &#x4E2D;&#x522A;&#x9664;&#x54E6;&#xFF1A;</p>
<p><code>$ git push &lt;REMOTENAME&gt; --delete &lt;BRANCHNAME&gt;</code></p>
Expand Down Expand Up @@ -88,7 +88,7 @@ <h2>&#x6487;&#x6B65;</h2>
<li><strong>&#x5207;&#x63DB;&#x6B63;&#x5728;&#x5DE5;&#x4F5C;&#x7684; <n><span class="superscript">&#x5206;&#x652F;</span>branch</n></strong></li>
<code>$ git checkout &lt;BRANCHNAME&gt;</code>
<li><strong>&#x522A;&#x9664;&#x672C;&#x6A5F;&#x7684; <n><span class="superscript">&#x5206;&#x652F;</span>branch</n></strong></li>
<code>$ git branch -D &lt;BRANCHNAME&gt;</code>
<code>$ git branch -d &lt;BRANCHNAME&gt;</code>
<li><strong>&#x522A;&#x9664; <n><span class="superscript">&#x9060;&#x7AEF;</span>remote</n> <n><span class="superscript">&#x5206;&#x652F;</span>branch</n></strong></li>
<code>$ git push &lt;REMOTENAME&gt; --delete &lt;BRANCHNAME&gt;</code>
<li><strong>&#x5F9E; <n><span class="superscript">&#x9060;&#x7AEF;</span>remote</n> <n><span class="superscript">&#x5206;&#x652F;</span>branch</n> <v><span class="superscript">&#x6536;&#x53D6;</span>Pull</v></strong></li>
Expand Down

0 comments on commit 890b224

Please sign in to comment.