Skip to content
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

Sierra Thu Mai Collaboration Post #371

Open
wants to merge 4 commits into
base: gh-pages
Choose a base branch
from
Open

Sierra Thu Mai Collaboration Post #371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0c6e649
add the pipes
srmoore5 Mar 17, 2014
431bb22
create the post collab
srmoore5 Mar 22, 2014
856fef8
delete
srmoore5 Mar 22, 2014
d4b55bf
create the filed
srmoore5 Mar 22, 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
25 changes: 25 additions & 0 deletions _posts/2014-03-16-sierrapipes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
---
layout: post
author: srmoore5
title: Sierra's Pipes Post
date: 2014-03-16
---

Pipes Challenge Answers

I set up the pipes directory in class.

1. Using sort -n reverses the sorting process.


2. The addition of the "<" means that the input has been redirected.


3. It only removes adjacent duplicated lines because using this command would take a very long time
Placing the uniq after the pipe works as well.


4. animals.text


5. Additional commands include
24 changes: 24 additions & 0 deletions _posts/2014-03-20-githubcollab.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
---
layout: post
author:
- tlchristian
- srmoore5
title: Thu-Mai & Sierra's Github Collaboration
date: 2014-03-20
---

#Thu-Mai says:

This week, Sierra and I teamed up for the Github Collaboration assignment. She set up my North Dakota State University (Go Bison!) file with the appropriate stats labels, and I set up her University of Massachusetts file. It was nice to be able to go through the process of creating a branch, making and committing file changes, submitting the pull request, merging the pull request, and giving each other a high-five when it was all done. Well, the high-five came after a bit of troubleshooting. We had a bit of trouble getting pull requests to go in the right direction and we had a conflict issue. It didn't help that we couldn't get Nitrous running on both of our machines. But after we did some workarounds and resolved our issues, we got it done! I'm looking forward to applying this collaborative process to my final project. It will certainly make life easier.

Click [here](https://github.com/silshack/NCAA/pull/11) to view the pull request for the University of Massachusetts file updates.



***

#Sierra says:

It was challenging to make certain that the branch was created in the right place. At first there was a conflict because I was actually submitting pull requests backwards! The issue was quickly resolved though, and github and nitrous.io have become much simple to use.

Click [here](https://github.com/silshack/NCAA/pull/34) to view the pull request for the North Dakota State University and University of Massachusetts file updates.