Skip to content

Commit

Permalink
rebuild with fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Jessica Lord committed Jan 29, 2015
1 parent 6a5d964 commit 9911bb4
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions guide/challenges/merge_tada.html
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ <h2>Step: Merge Locally</h2>
<p><code>$ git merge &#60;BRANCHNAME&#62;</code></p>

<p>Tidy up by deleting your feature branch now that it has been merged.</p>
<p><code>$ git branch -D &#60;BRANCHNAME&#62;</code></p>
<p><code>$ git branch -d &#60;BRANCHNAME&#62;</code></p>

<p>You can also delete the branch from your fork on GitHub:</p>
<p><code>$ git push &#60;REMOTENAME&#62; --delete &#60;BRANCHNAME&#62;</code></p>
Expand Down Expand Up @@ -95,7 +95,7 @@ <h2>Tips</h2>
<li><strong>Change the branch you're working on</strong></li>
<code>$ git checkout &#60;BRANCHNAME&#62;</code>
<li><strong>Delete a local branch</strong></li>
<code>$ git branch -D &#60;BRANCHNAME&#62;</code>
<code>$ git branch -d &#60;BRANCHNAME&#62;</code>
<li><strong>Delete a remote branch</strong></li>
<code>$ git push &#60;REMOTENAME&#62; --delete &#60;BRANCHNAME&#62;</code>
<li><strong>Pull from a remote branch</strong></li>
Expand Down

0 comments on commit 9911bb4

Please sign in to comment.