Skip to content

answered mac.md questiions #1823

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 mac.md questiions #1823

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
13 changes: 13 additions & 0 deletions mac.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,16 @@ Now that you are all set up, it's time to learn a little more about the tools of
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?
1a.gits a tool used to manage mutiple different source code edits that get turned
into repositories
2a git hub is a site/location to store git repositories. while git is the tool
used to make those repositories.
3a to make it easier for mutiple different teams to collaborate on one main code
base.
4a to tell others about changes you made in the repository.
5a git switch <branchname>
6a git fetch will download commits and files from a remote repository into your local one, while git merge combines mutiple branchs of commits into one and git pull will take content from a
repository and change the local one to match.
7a when changes that conflict are made to the same line.
8a by generating a list of files affected and going in and making changes