From 4a00a5f7a48c2af5e2eecd2e7d9f570e511ff77e Mon Sep 17 00:00:00 2001 From: SymanziJ <97126299+SymanziJ@users.noreply.github.com> Date: Mon, 10 Jan 2022 19:13:30 -0500 Subject: [PATCH] answered questions and followed the checklists --- README.md | 8 ++++---- pc.md | 28 +++++++++++++++++----------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 5cef2ca23..fba793ce4 100644 --- a/README.md +++ b/README.md @@ -6,10 +6,10 @@ This project consists of two parts: ## Task 1: Set up Project You will need to follow the BloomTech Git Workflow to add a file to this project follow the steps below: -- [ ] Create your own version of this repo - Fork -- [ ] Clone this repo -- [ ] Create a branch `git checkout -b 'firstName-lastName'` -- [ ] Complete your set up tasks ans answer the questions in the `mac.md` or `pc.md` file, depending on which operating system you are using. Please not that if you are on a linux machine, you should be completing the `mac.md` file. +- [X] Create your own version of this repo - Fork +- [X] Clone this repo +- [X] Create a branch `git checkout -b 'firstName-lastName'` +- [X] Complete your set up tasks ans answer the questions in the `mac.md` or `pc.md` file, depending on which operating system you are using. Please not that if you are on a linux machine, you should be completing the `mac.md` file. - [ ] Run your usual git commands for adding/committing and pushing **Be sure to push to your branch!** - [ ] Create a Pull-Request to submit your work - [ ] Use your own student fork as the base (compare across forks, base-fork -> main). diff --git a/pc.md b/pc.md index 4162a18bd..d360eccfe 100644 --- a/pc.md +++ b/pc.md @@ -3,26 +3,32 @@ Welcome to day 1 at BloomTech, today we are going to spend time setting up your computer and learning the tools that you will be using to complete this program. Just like day 1 at a job, you will need to get your environment set up to build and run your code. Complete the set up tasks below and then get started on the research questions. Once you have finished check out the submission instructions in the `README.md` file to turn in your assignment for the day. ## Set Up Tasks -1. [ ] [Download gitbash]() - Windows computers speak in a language called powershell however we will be speaking to our computers in a language called unixshell, in order to all be speaking the same language if you are using a PC you will need to download gitbash and use this program instead of the native command line. Whenever you see an instruction to use the terminal that will be your queue to open up gitbash. On a PC gitbash will be your terminal. -2. [ ] sign up for a [GitHub account](https://github.com/join) - please use a professional username. We recommending using your `firstname` `lastname` -3. [ ] [Set up your SSH key](https://docs.github.com/en/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent) - GitHub uses SSH to keep their files secure. You will need to set up one SSH key for every computer that you want to access your GitHub account on. Please ensure you go through all of the steps to generate a new key, add a new key and test your connection. -4. [ ] [Download Zoom](https://zoom.us/download) - make sure your zoom display name is your `first name` `last name` -5. [ ] [Download Slack](https://slack.com/intl/en-ca/help/articles/209038037-Download-Slack-for-Windows) - make sure your slack display name is your `first name` `last name` -6. [ ] [Download VS code](https://code.visualstudio.com/download) - this will be the tool you use to write all of your code. We recommend installing the following extensions: +1. [X] [Download gitbash]() - Windows computers speak in a language called powershell however we will be speaking to our computers in a language called unixshell, in order to all be speaking the same language if you are using a PC you will need to download gitbash and use this program instead of the native command line. Whenever you see an instruction to use the terminal that will be your queue to open up gitbash. On a PC gitbash will be your terminal. +2. [X] sign up for a [GitHub account](https://github.com/join) - please use a professional username. We recommending using your `firstname` `lastname` +3. [X] [Set up your SSH key](https://docs.github.com/en/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent) - GitHub uses SSH to keep their files secure. You will need to set up one SSH key for every computer that you want to access your GitHub account on. Please ensure you go through all of the steps to generate a new key, add a new key and test your connection. +4. [X] [Download Zoom](https://zoom.us/download) - make sure your zoom display name is your `first name` `last name` +5. [X] [Download Slack](https://slack.com/intl/en-ca/help/articles/209038037-Download-Slack-for-Windows) - make sure your slack display name is your `first name` `last name` +6. [X] [Download VS code](https://code.visualstudio.com/download) - this will be the tool you use to write all of your code. We recommend installing the following extensions: - [ES Lint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint) - [Prettier](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode) - [Spell Checker](https://marketplace.visualstudio.com/items?itemName=streetsidesoftware.code-spell-checker) - [Live Server](https://marketplace.visualstudio.com/items?itemName=ritwickdey.LiveServer) -7. [ ] [Download Node.JS](https://nodejs.org/en/) - Please download the latest stable version. We will be using Node.JS to run the tests in all of our javaScript assignments. Test driven development is a common practice in the world of web dev. You can read more about it [here](https://www.freecodecamp.org/news/test-driven-development-what-it-is-and-what-it-is-not-41fa6bca02a2/) -8. [ ] Sign up for a free [codepen account](https://codepen.io/accounts/signup/user/free) +7. [X] [Download Node.JS](https://nodejs.org/en/) - Please download the latest stable version. We will be using Node.JS to run the tests in all of our javaScript assignments. Test driven development is a common practice in the world of web dev. You can read more about it [here](https://www.freecodecamp.org/news/test-driven-development-what-it-is-and-what-it-is-not-41fa6bca02a2/) +8. [X] Sign up for a free [codepen account](https://codepen.io/accounts/signup/user/free) ## Research Questions Now that you are all set up, it's time to learn a little more about the tools of the trade. Edit this file and answer the following questions. You can type your answer below the questions. You are going to need to start familiarizing yourself with the [GitHub docs](https://docs.github.com/en) doc short for documentation are the instructions on how to use a languge, or program. A large part of your job as a developer will be learning how to read and work with documentation. Please reference the GitHub docs when answering the questions below. If you cannot find what you are looking for in the docs, you can always start to practice your google skills. -1. What is git? What is the difference between git and GitHub? +1. What is git? What is the difference between git and GitHub? +Git is an Open Source Distributed Control System. Github is a cloud-based git hosting service. 2. Why do we create a branch? +A branch is a independent line of a repository which you can use to keep your work separate from the main/master and other team members' work. 3. What is the purpose of a pull request? -4. What is the command you can use to switch between branches? For example you are working on a feature branch and you want to switch back to main. +The pull request is a mechanism that notifies other team members that changes are ready to be reviewed and merged into the main branch. +4. What is the command you can use to switch between branches? +For example you are working on a feature branch and you want to switch back to main. +git checkout 5. Explain the difference between `git fetch`, `git merge` and `git pull` what does each command do? -6. What is a merge conflict? How do you resolve a merge conflict? \ No newline at end of file +Git fetch downloads content from a remote repository. Git merge integrates forked history back together into one branch. Git pull is a combination of git fetch and git merge. +6. What is a merge conflict? How do you resolve a merge conflict? Merge conflicts are when git is unable to determine how to automatically merge changes together. To resolve a conflict, you can use the status, log, and diff commands to find the problems. Or, you can use checkout to go back to a previous commit. \ No newline at end of file