Skip to content

Answered research questions #1825

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Answered research questions #1825

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 9 additions & 8 deletions mac.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@

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?
2. What is the difference between Git and GitHub?
3. Why do we create a branch?
4. What is the purpose of a Pull Request?
5. What is the command you can use to switch between branches? For example you are working on FIRSTNAME-LASTNAME branch and you want to switch back to main.
6. Explain the difference between `git fetch`, `git merge` and `git pull`. What does each command do?
7. What is a merge conflict?
8. How do you resolve a merge conflict?
1. What is Git? Git is a source-code management tool.
2. What is the difference between Git and GitHub? Git is a version control system, while GitHub is a cloud-based hosting service that lets you manage Git repositories.
3. Why do we create a branch? So we can work on the task separately from the original version, and then so we can compare it with the main branch to merge the versions or track changes.
4. What is the purpose of a Pull Request? The pull request lets you tell others about changes you've pushed to a branch in a GitHub repository.
5. What is the command you can use to switch between branches? For example you are working on FIRSTNAME-LASTNAME branch and you want to switch back to main. git checkout main
6. Explain the difference between `git fetch`, `git merge` and `git pull`. What does each command do? git fetch lets you download objects from another repository, while git pull lets you fetch from and integrate with another repository or local branch. Git merge lets you merge one branch with other branches in a repository
7. What is a merge conflict? It occurs when there are unresolved different in codes between two commits
8. How do you resolve a merge conflict? Go on pull request and find the resolve conflict button, then proceed to make changes to the codes, then mark as resolved.