From 3be3b3b1a01a49e25257e7252eb6114e2a68d7e0 Mon Sep 17 00:00:00 2001 From: bdferr Date: Wed, 19 Mar 2014 16:08:37 +0000 Subject: [PATCH 1/6] Fixed typo in spelling of the word exercises --- exercises.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exercises.markdown b/exercises.markdown index efb07e6..30258dd 100644 --- a/exercises.markdown +++ b/exercises.markdown @@ -1,6 +1,6 @@ --- layout: default -title: "Exericises" +title: "Exercises" --- ## {{ site.course.number }} Exercises From d234c2e709df726d028e3ef9cc02732c395cb5ed Mon Sep 17 00:00:00 2001 From: bdferr Date: Fri, 21 Mar 2014 22:06:23 +0000 Subject: [PATCH 2/6] Post about collaboration --- _posts/2014-03-21-bdferr_gerbal_ncaa_post.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 _posts/2014-03-21-bdferr_gerbal_ncaa_post.md diff --git a/_posts/2014-03-21-bdferr_gerbal_ncaa_post.md b/_posts/2014-03-21-bdferr_gerbal_ncaa_post.md new file mode 100644 index 0000000..9de62e9 --- /dev/null +++ b/_posts/2014-03-21-bdferr_gerbal_ncaa_post.md @@ -0,0 +1,17 @@ +--- +layout : post +author: + -gerbal + -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). \ No newline at end of file From 99cb7c0ee8c282c5df50ded6a858abbdc0b92cb7 Mon Sep 17 00:00:00 2001 From: bdferr Date: Fri, 21 Mar 2014 22:07:22 +0000 Subject: [PATCH 3/6] Edited post about collaboration --- _posts/2014-03-21-bdferr_gerbal_ncaa_post.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_posts/2014-03-21-bdferr_gerbal_ncaa_post.md b/_posts/2014-03-21-bdferr_gerbal_ncaa_post.md index 9de62e9..f140ea7 100644 --- a/_posts/2014-03-21-bdferr_gerbal_ncaa_post.md +++ b/_posts/2014-03-21-bdferr_gerbal_ncaa_post.md @@ -1,9 +1,9 @@ --- layout : post -author: +author : -gerbal -bdferr -title: Grant and Brendan's collaboration +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. From 75ddee31379b636a2b24f472bad97424ece3a0ae Mon Sep 17 00:00:00 2001 From: bdferr Date: Fri, 21 Mar 2014 22:24:56 +0000 Subject: [PATCH 4/6] Modified post on collaboration --- _posts/2014-03-21-bdferr_gerbal_ncaa_post.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_posts/2014-03-21-bdferr_gerbal_ncaa_post.md b/_posts/2014-03-21-bdferr_gerbal_ncaa_post.md index f140ea7..d54a3a3 100644 --- a/_posts/2014-03-21-bdferr_gerbal_ncaa_post.md +++ b/_posts/2014-03-21-bdferr_gerbal_ncaa_post.md @@ -1,8 +1,8 @@ --- layout : post author : - -gerbal - -bdferr + - grant + - bdferr title : Grant and Brendan's collaboration --- From d6d765dc23bf18f487f6efd418a8a043b25bb75b Mon Sep 17 00:00:00 2001 From: bdferr Date: Fri, 21 Mar 2014 22:47:46 +0000 Subject: [PATCH 5/6] Updated information about me as I am taking time off from being an editor/writer --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index 33bc03d..9221e9f 100644 --- a/_config.yml +++ b/_config.yml @@ -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 From b67c25609bf7879791adc6e0732095b84b37a8e4 Mon Sep 17 00:00:00 2001 From: bdferr Date: Fri, 28 Mar 2014 21:24:49 +0000 Subject: [PATCH 6/6] This is regarding my embedded tweet post --- _posts/2014-03-28-bdferrembeddedtweet.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 _posts/2014-03-28-bdferrembeddedtweet.md diff --git a/_posts/2014-03-28-bdferrembeddedtweet.md b/_posts/2014-03-28-bdferrembeddedtweet.md new file mode 100644 index 0000000..11f2188 --- /dev/null +++ b/_posts/2014-03-28-bdferrembeddedtweet.md @@ -0,0 +1,11 @@ +--- +layout : post +author : bdferr +title : Bdferr's Embedded Tweet +--- +Here is my tweet. + + + + +That is all. \ No newline at end of file