From ae6cb18915c42885e93e23d71b1187e7187e8660 Mon Sep 17 00:00:00 2001 From: Alexander Ela Date: Tue, 20 Feb 2018 18:37:45 +0000 Subject: [PATCH 1/4] Viking Test Yourself First Submission --- .DS_Store | Bin 0 -> 6148 bytes prep_basics | 1 + 2 files changed, 1 insertion(+) create mode 100644 .DS_Store create mode 160000 prep_basics diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..f3a471417c1b82168b84d094afd25ec1db189af1 GIT binary patch literal 6148 zcmeHK!AiqG5S^`6Hx#i4p&s|*t%r(5y$B)JgEt|f2bG%GqJf%}B(-R)>9BjT38Yi8RiuDi*Jx3Qp2q1$9 zu4bay@gEtWZ&!mMq|nFq^Y_cbaW)JGNr(}z;cyUTd8_p%Dht)crDZ8)O|Hlb|0Wsx zd617XFG$a*cNF9|p|y{bWbk1J;YrjVck65WNt_2!+)s6K)azr&`DqmQlChVJ;$Eib z@y&qaIMV6X8%5FHZK|#I_N1wbot;)wwcA^hi6a{un|p_sxAzalLn@( o#gzs>Qqa()7-OjvucK-~zaj(CwOATN4+>udG!5J^1AofEJ4;Gbf&c&j literal 0 HcmV?d00001 diff --git a/prep_basics b/prep_basics new file mode 160000 index 0000000..dfb9d69 --- /dev/null +++ b/prep_basics @@ -0,0 +1 @@ +Subproject commit dfb9d69d616242f3444309769c85ad677a36421c From e045f1feba8e2961867c7cbf364a89ffeccc359d Mon Sep 17 00:00:00 2001 From: Alexander Ela Date: Tue, 20 Feb 2018 19:08:46 +0000 Subject: [PATCH 2/4] Viking Test Yourself Sub 1 --- test-yourself-answers.md | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/test-yourself-answers.md b/test-yourself-answers.md index 597c06b..a2bb96c 100644 --- a/test-yourself-answers.md +++ b/test-yourself-answers.md @@ -1,4 +1,4 @@ -# Test Yourself: Answers +# Test Yourself: Answers This is the file you'll use to add your answers to the [Test Yourself exercise](http://www.vikingcodeschool.com/web-development-basics/getting-comfortable-with-git-and-the-command-line). You will add them via pull request. @@ -326,7 +326,14 @@ i.e. 'subl text.txt' *Contributed by [Matt Davis](http://github.com/chewieee)* +#### NEW QUESTION: What is the difference between "shell," "command line," "bash," and "terminal,"? +A "shell" is a text-based interface that allows users to interact with a computer's operating system. +A "command line" is a text-based interface, synonymous with "shell." A command line's text-based nature contrasts with that of a graphical user interface, or "GUI." +"Bash" refers to a specific type of shell and stands for "Bourne-Again Shell." Bash is the standard test-based interface for OS X. +"Terminal" is the name of the default bash-based, command line application in OS X. + +*Contributed by [Alexander Ela](http://github.com/alexanderela)* ## Terms to Know @@ -811,6 +818,14 @@ git log You can look through a history of commits by clicking on the repository name and then clicking the commits. *Contributed by [Jason Barkley](https://github.com/jbarkl3y)* +#### NEW QUESTION: In the context of Git/Github, what is the difference between "upstream" and "origin"? + +"Upstream" refers to the original repository that has been forked in Github. "Upstream" is a standard term used to reference this original repository when working in Git and remotely connecting to this original repository in Github. +"Origin" refers to the forked version of the original repository in Github. As with "upstream," "origin" is a standard term used to reference the forked version of the original Github repository, when working in Git and remotely connecting the forked version in Github. + +*Contributed by [Alexander Ela](http://github.com/alexanderela)* + + ### Branching and Merging @@ -910,4 +925,10 @@ In order to solve a Merge Conflict, one needs to open the conflicting file in a *Contributed by [Garrett Weinert](https://github.com/gweinert)* +#### NEW QUESTION: In the context of Git/Github, what is the difference between "forking" and "cloning"? + +"Forking" refers to making a copy of a repository in Github. +"Cloning" refers to making a local copy of a forked version of a repository for use with Git. + +*Contributed by [Alexander Ela](http://github.com/alexanderela)* From 06e46b4076e19a15b9b9e65eeda9b392ce7da7d1 Mon Sep 17 00:00:00 2001 From: Alexander Ela Date: Wed, 7 Mar 2018 22:17:10 +0100 Subject: [PATCH 3/4] Git Practice 1: March 7, 2018 --- test-yourself-answers.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test-yourself-answers.md b/test-yourself-answers.md index a2bb96c..f9daf28 100644 --- a/test-yourself-answers.md +++ b/test-yourself-answers.md @@ -932,3 +932,5 @@ In order to solve a Merge Conflict, one needs to open the conflicting file in a *Contributed by [Alexander Ela](http://github.com/alexanderela)* +March 7, 2018 Practice: Day 1 + From 60f45e790d43843deecf0f00b302ba3b3abca858 Mon Sep 17 00:00:00 2001 From: Alexander Ela Date: Thu, 8 Mar 2018 17:20:05 +0100 Subject: [PATCH 4/4] Git Daily Practice: Day 2 --- test-yourself-answers.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test-yourself-answers.md b/test-yourself-answers.md index f9daf28..3ad707d 100644 --- a/test-yourself-answers.md +++ b/test-yourself-answers.md @@ -932,5 +932,6 @@ In order to solve a Merge Conflict, one needs to open the conflicting file in a *Contributed by [Alexander Ela](http://github.com/alexanderela)* -March 7, 2018 Practice: Day 1 - +-------------------------------------------------------------- +1. March 7, 2018 Practice: Day 1 +2. March 8, 2018 Practice: Day 2