From 3611aed41e71426a0a32ceeafa9572713b1dc770 Mon Sep 17 00:00:00 2001 From: zbay Date: Wed, 19 Mar 2014 19:09:16 +0000 Subject: [PATCH 1/8] Zach wrote a reflection on the March Madness assignment --- _posts/2014-03-19-zachAllenMarchMadness.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 _posts/2014-03-19-zachAllenMarchMadness.md diff --git a/_posts/2014-03-19-zachAllenMarchMadness.md b/_posts/2014-03-19-zachAllenMarchMadness.md new file mode 100644 index 0000000..af5316b --- /dev/null +++ b/_posts/2014-03-19-zachAllenMarchMadness.md @@ -0,0 +1,19 @@ +--- +layout: post +author: + -zbay + -allen +title: Zach and Allen's March Madness post +date: 2014-03-19 +--- + +We misinterpreted the instructions and originally operated off of one branch entitled "ZachAllen".. Zach wrote the +fields for Mercer, Allen wrote the fields for Dayton, and we pushed from our local branches to the master. Then we pulled from the master and filled +in the info (wins, appearances, and coach). + +We had to start over with the two separate branches to comply with the assignment, Mercer and Dayton. +The complexity of trying to undo what we had done caused some problems, including merge conflicts that had to be resolved in Nitrous. + +I won't speak for Allen, but I will chalk our difficulties up to an inadequate grasp on the branching paradigm. Using a single +branch for our edits seemed like a perfectly reasonable idea. It is just now setting in that branching must be done liberally and updated only +from the master branch. \ No newline at end of file From 91f26eb2f71e2478721b8106ec48ce1960aa3ef8 Mon Sep 17 00:00:00 2001 From: zbay Date: Wed, 19 Mar 2014 19:13:06 +0000 Subject: [PATCH 2/8] Uncommited changes --- _posts/2014-03-19-zachAllenMarchMadness.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/2014-03-19-zachAllenMarchMadness.md b/_posts/2014-03-19-zachAllenMarchMadness.md index af5316b..fabb88b 100644 --- a/_posts/2014-03-19-zachAllenMarchMadness.md +++ b/_posts/2014-03-19-zachAllenMarchMadness.md @@ -14,6 +14,6 @@ in the info (wins, appearances, and coach). We had to start over with the two separate branches to comply with the assignment, Mercer and Dayton. The complexity of trying to undo what we had done caused some problems, including merge conflicts that had to be resolved in Nitrous. -I won't speak for Allen, but I will chalk our difficulties up to an inadequate grasp on the branching paradigm. Using a single +I won't speak for Allen, but I will chalk our difficulties up to my inadequate grasp on the branching paradigm. Using a single branch for our edits seemed like a perfectly reasonable idea. It is just now setting in that branching must be done liberally and updated only from the master branch. \ No newline at end of file From 3056180c201b5659dbfc0f416c0cd2e1e927dee2 Mon Sep 17 00:00:00 2001 From: zbay Date: Wed, 19 Mar 2014 20:38:47 +0000 Subject: [PATCH 3/8] Edited post content --- _posts/2014-03-19-zachAllenMarchMadness.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/_posts/2014-03-19-zachAllenMarchMadness.md b/_posts/2014-03-19-zachAllenMarchMadness.md index fabb88b..1e57f35 100644 --- a/_posts/2014-03-19-zachAllenMarchMadness.md +++ b/_posts/2014-03-19-zachAllenMarchMadness.md @@ -13,7 +13,8 @@ in the info (wins, appearances, and coach). We had to start over with the two separate branches to comply with the assignment, Mercer and Dayton. The complexity of trying to undo what we had done caused some problems, including merge conflicts that had to be resolved in Nitrous. +There was some nonsensical code added to the Dayton file when it was committed. Deleting it somehow fixed the merge conflict. -I won't speak for Allen, but I will chalk our difficulties up to my inadequate grasp on the branching paradigm. Using a single -branch for our edits seemed like a perfectly reasonable idea. It is just now setting in that branching must be done liberally and updated only -from the master branch. \ No newline at end of file +We will chalk our difficulties up to an inadequate grasp on the branching paradigm. Using a single +branch for our edits seemed like a reasonable idea at first. It is just now setting in, at least for Zach, that branching +must be done liberally and branches updated only from the master branch. \ No newline at end of file From f0e3285d4eba7c3611a865890efbbedd6e0c3dc8 Mon Sep 17 00:00:00 2001 From: zbay Date: Wed, 19 Mar 2014 20:42:42 +0000 Subject: [PATCH 4/8] Edited post content --- _posts/2014-03-19-zachAllenMarchMadness.md | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/_posts/2014-03-19-zachAllenMarchMadness.md b/_posts/2014-03-19-zachAllenMarchMadness.md index 1e57f35..5a7f834 100644 --- a/_posts/2014-03-19-zachAllenMarchMadness.md +++ b/_posts/2014-03-19-zachAllenMarchMadness.md @@ -7,14 +7,13 @@ title: Zach and Allen's March Madness post date: 2014-03-19 --- -We misinterpreted the instructions and originally operated off of one branch entitled "ZachAllen".. Zach wrote the -fields for Mercer, Allen wrote the fields for Dayton, and we pushed from our local branches to the master. Then we pulled from the master and filled -in the info (wins, appearances, and coach). +We misinterpreted the instructions and originally operated off of one branch entitled "ZachAllen". Zach wrote the fields for Mercer, Allen wrote the +fields for Dayton, and we pushed from our local branches to the master. Then we pulled from the master and filled in the info +(wins, appearances, and coach). -We had to start over with the two separate branches to comply with the assignment, Mercer and Dayton. -The complexity of trying to undo what we had done caused some problems, including merge conflicts that had to be resolved in Nitrous. -There was some nonsensical code added to the Dayton file when it was committed. Deleting it somehow fixed the merge conflict. +We had to start over with the two separate branches to comply with the assignment, Mercer and Dayton. The complexity of trying to undo what we had +done caused some problems, including merge conflicts that had to be resolved in Nitrous.There was some nonsensical code added to the Dayton file when +it was committed. Deleting it somehow fixed the merge conflict. -We will chalk our difficulties up to an inadequate grasp on the branching paradigm. Using a single -branch for our edits seemed like a reasonable idea at first. It is just now setting in, at least for Zach, that branching -must be done liberally and branches updated only from the master branch. \ No newline at end of file +We will chalk our difficulties up to an inadequate grasp on the branching paradigm. Using a single branch for our edits seemed like a reasonable +idea at first. It is just now setting in, at least for Zach, that branching must be done liberally and branches updated only from the master branch. \ No newline at end of file From d13ffdcbf52914e3856922c1f8356698d3545dc3 Mon Sep 17 00:00:00 2001 From: zbay Date: Wed, 19 Mar 2014 20:46:29 +0000 Subject: [PATCH 5/8] Fixed author names --- _posts/2014-03-19-zachAllenMarchMadness.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_posts/2014-03-19-zachAllenMarchMadness.md b/_posts/2014-03-19-zachAllenMarchMadness.md index 5a7f834..818bfe0 100644 --- a/_posts/2014-03-19-zachAllenMarchMadness.md +++ b/_posts/2014-03-19-zachAllenMarchMadness.md @@ -1,8 +1,8 @@ --- layout: post author: - -zbay - -allen + - zbay + - allen title: Zach and Allen's March Madness post date: 2014-03-19 --- From d674636834a8599574ac464f445df3d23acb1024 Mon Sep 17 00:00:00 2001 From: zbay Date: Thu, 20 Mar 2014 03:30:42 +0000 Subject: [PATCH 6/8] Added the pull request links --- _posts/2014-03-19-zachAllenMarchMadness.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/_posts/2014-03-19-zachAllenMarchMadness.md b/_posts/2014-03-19-zachAllenMarchMadness.md index 818bfe0..23c4abd 100644 --- a/_posts/2014-03-19-zachAllenMarchMadness.md +++ b/_posts/2014-03-19-zachAllenMarchMadness.md @@ -11,6 +11,11 @@ We misinterpreted the instructions and originally operated off of one branch ent fields for Dayton, and we pushed from our local branches to the master. Then we pulled from the master and filled in the info (wins, appearances, and coach). +[Here's the link for Mercer...](https://github.com/silshack/NCAA/pull/27) +[...and the one for Dayton.](https://github.com/silshack/NCAA/pull/28) + + + We had to start over with the two separate branches to comply with the assignment, Mercer and Dayton. The complexity of trying to undo what we had done caused some problems, including merge conflicts that had to be resolved in Nitrous.There was some nonsensical code added to the Dayton file when it was committed. Deleting it somehow fixed the merge conflict. From 10f47de114ecf5c801700a8f5af32537d5ee8bb7 Mon Sep 17 00:00:00 2001 From: zbay Date: Thu, 20 Mar 2014 03:34:35 +0000 Subject: [PATCH 7/8] Deleted excess spacing --- _posts/2014-03-19-zachAllenMarchMadness.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/_posts/2014-03-19-zachAllenMarchMadness.md b/_posts/2014-03-19-zachAllenMarchMadness.md index 23c4abd..1c0ad7f 100644 --- a/_posts/2014-03-19-zachAllenMarchMadness.md +++ b/_posts/2014-03-19-zachAllenMarchMadness.md @@ -14,8 +14,6 @@ fields for Dayton, and we pushed from our local branches to the master. Then we [Here's the link for Mercer...](https://github.com/silshack/NCAA/pull/27) [...and the one for Dayton.](https://github.com/silshack/NCAA/pull/28) - - We had to start over with the two separate branches to comply with the assignment, Mercer and Dayton. The complexity of trying to undo what we had done caused some problems, including merge conflicts that had to be resolved in Nitrous.There was some nonsensical code added to the Dayton file when it was committed. Deleting it somehow fixed the merge conflict. From 80769e3d375d3e538f7c2d0b6b114a621fd5d806 Mon Sep 17 00:00:00 2001 From: zbay Date: Wed, 26 Mar 2014 17:34:03 +0000 Subject: [PATCH 8/8] Wrote a tweet using Twython post --- _posts/2014-03-26-zbayTwitterPost.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 _posts/2014-03-26-zbayTwitterPost.md diff --git a/_posts/2014-03-26-zbayTwitterPost.md b/_posts/2014-03-26-zbayTwitterPost.md new file mode 100644 index 0000000..7f46fc5 --- /dev/null +++ b/_posts/2014-03-26-zbayTwitterPost.md @@ -0,0 +1,11 @@ +--- +layout: post +author: zbay +title: Zach's Twitter exercise +date: 2014-03-26 +--- + +I wrote a tweet using Twython! It's so easy, even a goateed baby can do it! + + + \ No newline at end of file