Part 11: Git and Teamwork

_____ is a version control system used to track changes in code and help developers work on the same project safely.

Git

A(n) _____ is a folder that Git tracks, including its files, folders, and change history.

repository

_____ is the Git command used to start tracking a folder as a new repository.

init

_____ is the Git command used to see the current state of your repository, including changed and untracked files.

status

_____ is the Git command used to move changes into the staging area before making a commit.

add

A(n) _____ is a saved snapshot of your staged changes in Git.

commit

A(n) good _____ _____ clearly explains what changed and usually why the change was made.

commit message

_____ is the Git command used to view the history of commits in a repository.

log

_____ is the Git command used to see the differences between files or changes in Git.

diff

_____ are separate lines of development that let you work on changes without affecting other work right away.

branches

_____ and _____ are Git commands used to move from one branch to another.

checkout, switch

_____ is the Git command used to combine changes from one branch into another branch.

merge

_____ is the Git command used to replay commits on top of another branch to create a cleaner history.

rebase

A(n)

happens when Git can move a branch pointer straight ahead with no extra merge commit, while a(n) _____ _____ keeps the branch history connected with a separate merge snapshot.

_____ _____ is the process of fixing overlapping changes when Git cannot automatically combine code from different branches.

conflict resolution

A(n) _____ repository is a version of the repository stored somewhere else, usually on a platform like GitHub.

remote

_____ is the Git command used to copy a remote repository onto your computer.

clone

_____ is the Git command used to bring down new changes from a remote repository and integrate them into your current branch.

pull

_____ is the Git command used to send your local commits up to a remote repository.

push

A(n) _____ _____ at a high level is a request to review and merge your branch changes into another branch, usually after feedback or approval.

pull request

To avoid breaking your main branch, you should make changes on a separate _____, test your work, and only merge reviewed code.

branch

In a(n) _____, you should be able to explain your Git workflow, such as creating a branch, making commits, pushing changes, opening a pull request, and then merging after review.

interview