diff --git a/homework.md b/homework.md index 1a8a59b2..a4fe4246 100644 --- a/homework.md +++ b/homework.md @@ -2,24 +2,34 @@ ## 1. What is 2 + 2? -5 +4 ## 2. What is JavaScript? -An exciting new play about coffee. +A programming language that makes websites etc. more dynamic: for example, enabling user interaction &/or animating objects. It works in conjunction with HTML (structure and content) and CSS (style). + +JavaScript is an interpreted language, so it is executed in a user's browser rather than being processed by the server first. ## 3. Name three problems Git & GitHub solve? -When people want to show off code to each other they can put it on GitHub +Git software enables developers to create and manage versions of a project. + +GitHub provides a platform for developers to work on these projects together, simultaneously, and to share them with others. + +By doing so, they solve the following problems: + +1. Not being able to work on the same project simultaneously +2. Not having a clear history of how a project developed, including knowing who was responsible for particular changes +3. Not having an easy system to review changes and agree what should be taken forward ## 4. What happens when you `fork` a repository? -You delete it +You make a copy of it, adding this copy to your own profile as a new repository. Unless you change it, this copy will still keep the original repository as its 'upstream' source. ## 5. What happens when you clone a repository? -It send it to a friend +You make a local copy. ## 6. What is a Pull Request? -When you send a file over the internet +When you request to merge a particular 'commit' or version of the project into the main branch - which essentially makes that version the latest/main one.