Skip to content

Tweetbranch #402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: gh-pages
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ authors:
gravatar:
github: bdferr
twitter:
about: Brendan is an MSIS student from Virginia. In his free time, he writes articles about drug policy at ssdp.org/about/blog-contributors/brendan-ferreri-hanberry/ and at the-libertarian.co.uk, where he serves as an editor.
about: Brendan is an MSIS student from Virginia with an undergraduate degree in German. In his free time, he is attempting to improve his foreign language skills and doing subtitles for Amara.org.
tlchristian:
name: Thu-Mai Christian
prof: false
Expand Down
17 changes: 17 additions & 0 deletions _posts/2014-03-21-bdferr_gerbal_ncaa_post.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
layout : post
author :
- grant
- bdferr
title : Grant and Brendan's collaboration
---

Brendan was at first confused about the placement of the NCAA repo; he had cloned it as ncaa inside of the spring2014 directory. Grant explained that “git repos do not live happily inside of each other,” so Brendan employed rm –rf ncaa. This one command removed all of the files in the ncaa directory, including all of the files in its subdirectories, then removed each subdirectory once it was empty, then removed the folder “ncaa” once it was empty. Brendan then respawned the ncaa directory outside of the spring2014 folder, so that it could have more Lebensraum.

After cloning the NCAA github repo in nitrous, Brendan made a branch called “wisconsin” inside it. He added the requested labels and pushed the file to the master branch for Grant to pull down to his own fork and edit, and Grant similarly entered the labels for the Arizona team on a newly created "Arizona" branch and pushed the Arizona file to the origin.

Brendan then pulled the Arizona file to his own fork and entered data about the Arizona Wildcats basketball team. Grant did the same for the Wisconsin Badgers.

Brendan did not know anything about basketball, but after searching Wikipedia and an ESPN [page](http://espn.go.com/mens-college-basketball/tournament/history/_/team1/5229) which Google (through Startpage.com) brought him to, he was able to find the relevant data.

Grant merged Brendan’s pull request [here](https://github.com/silshack/NCAA/pull/37), while Brendan merged Grant’s pull request [here](https://github.com/silshack/NCAA/pull/38).
11 changes: 11 additions & 0 deletions _posts/2014-03-28-bdferrembeddedtweet.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
layout : post
author : bdferr
title : Bdferr's Embedded Tweet
---
Here is my tweet.

<blockquote class="twitter-tweet" lang="en"><p>My name is Brendan and I am making a tweet which does not propose an alternative theory of your conception.</p>&mdash; silshack (@silshack) <a href="https://twitter.com/silshack/statuses/448869006116929537">March 26, 2014</a></blockquote>
<script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>

That is all.
2 changes: 1 addition & 1 deletion exercises.markdown
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
layout: default
title: "Exericises"
title: "Exercises"
---

## {{ site.course.number }} Exercises
Expand Down