From 0c6e6497162cadecbfe502b4246b914e75b529ff Mon Sep 17 00:00:00 2001 From: Sierra Moore Date: Mon, 17 Mar 2014 02:51:58 +0000 Subject: [PATCH 1/4] add the pipes --- _posts/2014-03-16-sierrapipes.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 _posts/2014-03-16-sierrapipes.md diff --git a/_posts/2014-03-16-sierrapipes.md b/_posts/2014-03-16-sierrapipes.md new file mode 100644 index 0000000..2332c1e --- /dev/null +++ b/_posts/2014-03-16-sierrapipes.md @@ -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 \ No newline at end of file From 431bb221e559004c8b5887e70e72ef023e91c2b7 Mon Sep 17 00:00:00 2001 From: srmoore5 Date: Fri, 21 Mar 2014 21:23:28 -0400 Subject: [PATCH 2/4] create the post collab bb --- _posts/2014-03-20-githubcollab.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 _posts/2014-03-20-githubcollab.md diff --git a/_posts/2014-03-20-githubcollab.md b/_posts/2014-03-20-githubcollab.md new file mode 100644 index 0000000..7299485 --- /dev/null +++ b/_posts/2014-03-20-githubcollab.md @@ -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. From 856fef853525ba70f432862fb179c81f7938201f Mon Sep 17 00:00:00 2001 From: srmoore5 Date: Fri, 21 Mar 2014 21:39:57 -0400 Subject: [PATCH 3/4] delete dfdfd --- _posts/2014-03-20-githubcollab.md | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 _posts/2014-03-20-githubcollab.md diff --git a/_posts/2014-03-20-githubcollab.md b/_posts/2014-03-20-githubcollab.md deleted file mode 100644 index 7299485..0000000 --- a/_posts/2014-03-20-githubcollab.md +++ /dev/null @@ -1,24 +0,0 @@ ---- -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. From d4b55bf002602a43cc81dc91077a8fd02d4d3bb2 Mon Sep 17 00:00:00 2001 From: srmoore5 Date: Fri, 21 Mar 2014 21:40:16 -0400 Subject: [PATCH 4/4] create the filed fdfdf --- _posts/2014-03-20-githubcollab.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 _posts/2014-03-20-githubcollab.md diff --git a/_posts/2014-03-20-githubcollab.md b/_posts/2014-03-20-githubcollab.md new file mode 100644 index 0000000..7299485 --- /dev/null +++ b/_posts/2014-03-20-githubcollab.md @@ -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.