diff --git a/pc.md b/pc.md index 28a9c65d6..f08edd4c9 100644 --- a/pc.md +++ b/pc.md @@ -3,10 +3,20 @@ 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 are going to need to start familiarizing yourself with the [GitHub docs](https://docs.github.com/en). Docs (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? + - Git is a version control system that tracks changes to files in directories on a computer 2. What is the difference between Git and GitHub? + - Github is the cloud based service that helps you manage open source projects while git is the control system to manage and track your source code history 3. Why do we create a branch? + - We create branches to isolate changes to the code 4. What is the purpose of a Pull Request? + - THe purpose of a pull request is to show others the changes you have pushed to a branch in a repository. 5. What is the command you can use to switch between branches? For example you are working on the FIRSTNAME-LASTNAME branch and you want to switch back to main. + - The command is: git checkout main 6. Explain the difference between `git fetch`, `git merge` and `git pull`. What does each command do? + - git fetch: this is command is used to grab contents of a remote branch + - git merge: integrating several branches into one single branch + - git pull: used to grab content from a remote server repository and update your local reporitory with that content 7. What is a merge conflict? + - When is git is unable to merge diferences in code between 2 commits 8. How do you resolve a merge conflict? + - Open the file and make necessary changes then re-commit to stage a new merge