From b9235fcfd1052bf3237155e7a2a955e44e36801a Mon Sep 17 00:00:00 2001 From: Addison Dalton Date: Fri, 1 Dec 2017 12:13:51 -0500 Subject: [PATCH 1/2] Add three questions --- test-yourself-answers.md | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/test-yourself-answers.md b/test-yourself-answers.md index 597c06b..a19dc7e 100644 --- a/test-yourself-answers.md +++ b/test-yourself-answers.md @@ -654,9 +654,9 @@ Schema - defines a set of rules as to how XML documents should look like, what Example: --This definition is in the schema document: - + ---This is the effect in XML document; List tags are with capital first letter, should include one or more Items which is defined by + sign. +--This is the effect in XML document; List tags are with capital first letter, should include one or more Items which is defined by + sign. Chocolate @@ -906,8 +906,18 @@ A merge conflict occurs during a merge when the same part of some file has chang #### How do you resolve a "Merge Conflict"? -In order to solve a Merge Conflict, one needs to open the conflicting file in a text editor and find the conflicting lines of code. One can find the conflict by spotting the merge markers. To resolve the this, delete the line you want to get rid of and then delete the merge markers. After deleting the merge markers, you can save the file, add it to the stage, and finally commit it. Done. +In order to solve a Merge Conflict, one needs to open the conflicting file in a text editor and find the conflicting lines of code. One can find the conflict by spotting the merge markers. To resolve the this, delete the line you want to get rid of and then delete the merge markers. After deleting the merge markers, you can save the file, add it to the stage, and finally commit it. Done. *Contributed by [Garrett Weinert](https://github.com/gweinert)* +#### What is Vim? + +Vim is a text editor similar to notepad, sublime, or atom. Vim is different in that it forces the user to only use the keyboard. It can be a good way to learn keyboard shortcuts. + +#### What is AJAX? + +AJAX stands for Asynchronous JavaScript and XML. AJAX allows web pages to be updated asynchronously by exchanging data with a server behind the scenes. This allows the web page to update parts of the page without reloading the entire page. + +#### What is the difference between a "remote" and your local repo? +The "remote" is your in the cloud repo. It isn't located on your computer and can be taken from any other computer. Your local repo is the one located on your computer and the repo you will be working within. From 5ad45df2ddadab91c3b67da0aad6e3868cc7e8aa Mon Sep 17 00:00:00 2001 From: Addison Dalton Date: Fri, 1 Dec 2017 12:19:16 -0500 Subject: [PATCH 2/2] added contribution section to three questions --- test-yourself-answers.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test-yourself-answers.md b/test-yourself-answers.md index a19dc7e..f78dfa1 100644 --- a/test-yourself-answers.md +++ b/test-yourself-answers.md @@ -914,10 +914,16 @@ In order to solve a Merge Conflict, one needs to open the conflicting file in a Vim is a text editor similar to notepad, sublime, or atom. Vim is different in that it forces the user to only use the keyboard. It can be a good way to learn keyboard shortcuts. +*Contributed by [Addison Dalton](https://github.com/Addison-Dalton)* + #### What is AJAX? AJAX stands for Asynchronous JavaScript and XML. AJAX allows web pages to be updated asynchronously by exchanging data with a server behind the scenes. This allows the web page to update parts of the page without reloading the entire page. +*Contributed by [Addison Dalton](https://github.com/Addison-Dalton)* + #### What is the difference between a "remote" and your local repo? The "remote" is your in the cloud repo. It isn't located on your computer and can be taken from any other computer. Your local repo is the one located on your computer and the repo you will be working within. + +*Contributed by [Addison Dalton](https://github.com/Addison-Dalton)*