Skip to content
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

Jump to bottom

Module 1 Project #1826

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Module 1 Project #1826

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd5af73
hello world text test
BenJohnsonFullStack Mar 24, 2023
4104f25
completed module 1 challenge
BenJohnsonFullStack Mar 24, 2023
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
9 changes: 9 additions & 0 deletions pc.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,19 @@
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?
A program that runs bash commands
2. What is the difference between Git and GitHub?
Git is a program that runs commands for managing files and repositories.
GitHub is a cloud-based server that houses files and repositories.
3. Why do we create a branch?
To ensure version control and enable a streamlined workflow in the case of multiple simultaneous users.
4. What is the purpose of a Pull Request?
To connect local and cloud-based repositories.
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.
git checkout -b main (confirm current branch with git branch)
6. Explain the difference between `git fetch`, `git merge` and `git pull`. What does each command do?
git fetch pulls in files from your remote hub without changing your local files, git merge moves a forked branch back into the main, git pull pulls remote files and simultaneously updates local files to match
7. What is a merge conflict?
a merge command that returns an error for competing commits
8. How do you resolve a merge conflict?
open the conflicting file and make necessary changes