Glossary

Version-control: The practice of tracking and managing changes to software code, also known as source control.

Staging area: An area dedicated to holding unpublished changes to be committed.

Staging: The act of moving a software change to the staging area. ex. stage/staging a change.

Commit: Captures a snapshot of staged changes. these snapshots will not be changed unless explicitly asked.

Push: Moving commits from a local repository to a remote repository.

Pull: Update the local repository with changes from the remote repository.

Clone: Creates an exact copy of the the existing repository.

Merge conflict: Cccurs when two commits change the same code and cannot be auto-resolved.

Source-code management: Process of tracking and managing changes to source code.

CRUD: Create, read, update, delete.

Repository: A location in which files are stored and managed.

Path: A variable containing directories that are searched through whenever running a program.

Branch: Points to a specific commit. multiple branches allow for multiple current commits.

Local: Stored in the current machine, typically only available to one person.

Remote: Stored online, or to a separated location, potentially accessible by multiple people.