Skip to content

Added three questions. #755

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

Open
Addison-Dalton wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added three questions. #755

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9235fc
Add three questions
Addison-Dalton Dec 1, 2017
5ad45df
added contribution section to three questions
Addison-Dalton Dec 1, 2017
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
22 changes: 19 additions & 3 deletions test-yourself-answers.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
<!ELEMENT List (Item)+>
<!ELEMENT List (Item)+>

--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.
<List>
<Item>Chocolate</Item>
</List>
Expand Down Expand Up @@ -906,8 +906,24 @@ 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.

*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)*