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

Jump to bottom

Answers to Viking Test Questions #768

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Answers to Viking Test Questions #768

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
ae6cb18
Viking Test Yourself First Submission
alexanderela Feb 20, 2018
e045f1f
Viking Test Yourself Sub 1
alexanderela Feb 20, 2018
06e46b4
Git Practice 1: March 7, 2018
alexanderela Mar 7, 2018
60f45e7
Git Daily Practice: Day 2
alexanderela Mar 8, 2018
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
Binary file added .DS_Store
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions prep_basics
Open in desktop
Submodule prep_basics added at dfb9d6
26 changes: 25 additions & 1 deletion test-yourself-answers.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -910,4 +925,13 @@ 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)*

--------------------------------------------------------------
1. March 7, 2018 Practice: Day 1
2. March 8, 2018 Practice: Day 2