Skip to content

Zach's Twitter post #378

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.

Sign up for GitHub

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 8 commits into
base: gh-pages
Choose a base branch
from
Open

Zach's Twitter post #378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3611aed
Zach wrote a reflection on the March Madness assignment
zbay Mar 19, 2014
91f26eb
Uncommited changes
zbay Mar 19, 2014
3056180
Edited post content
zbay Mar 19, 2014
f0e3285
Edited post content
zbay Mar 19, 2014
d13ffdc
Fixed author names
zbay Mar 19, 2014
d674636
Added the pull request links
zbay Mar 20, 2014
10f47de
Deleted excess spacing
zbay Mar 20, 2014
80769e3
Wrote a tweet using Twython post
zbay Mar 26, 2014
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
22 changes: 22 additions & 0 deletions _posts/2014-03-19-zachAllenMarchMadness.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
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).

[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.

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.
11 changes: 11 additions & 0 deletions _posts/2014-03-26-zbayTwitterPost.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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!

<blockquote class="twitter-tweet" lang="en"><p>hey guise im on twitter <a href="https://twitter.com/search?q=%23tweeting&amp;src=hash">#tweeting</a> <a href="https://twitter.com/search?q=%23content&amp;src=hash">#content</a> <a href="https://twitter.com/search?q=%23swag&amp;src=hash">#swag</a> <a href="https://twitter.com/search?q=%23yolo&amp;src=hash">#yolo</a> <a href="https://twitter.com/search?q=%23directioner&amp;src=hash">#directioner</a> <a href="https://twitter.com/search?q=%23beleiber&amp;src=hash">#beleiber</a></p>&mdash; madvillain z (@ThatsWutZeeSaid) <a href="https://twitter.com/ThatsWutZeeSaid/statuses/448869889546399745">March 26, 2014</a></blockquote>
<script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>