4 Version Control and Team Collaboration Free Online FlashCards

What does version control help a team do?

Version control records project-file changes over time, allowing teams to compare versions, restore earlier work, and trace how a project developed.

What makes Git a distributed version control system?

Git is distributed: each clone contains the repository’s history, and team members exchange work through shared remote repositories.

What does a repository contain?

A repository contains project files and their version history.

What does a Git commit record?

A commit records a set of changes at a point in the project’s history. Focused commits make changes easier to understand.

What is the working tree?

The working tree is the checked-out set of project files that a contributor is editing.

What is the purpose of Git’s staging area?

The staging area lets a contributor select which changes to include in the next commit.

What is the difference between `fetch` and `push`?

`fetch` obtains updates from a remote; `push` sends local commits to a remote.

What is a Git branch used for?

A branch is a movable name for a line of development. It can isolate a feature or fix while the main branch remains undisturbed.

What does a merge do?

A merge incorporates changes from one branch into another.

What happens during a fast-forward merge?

In a fast-forward merge, Git moves the target branch pointer forward without creating a merge commit.

What should contributors do when a merge conflict occurs?

A merge conflict occurs when Git cannot automatically reconcile overlapping edits. Contributors inspect the competing versions, choose the combined result, remove conflict markers, and run relevant checks.

What is a pull request for?

A pull request proposes merging one branch into another and provides a place to review changes, discuss them, request revisions, and check automated results.