Software Design: Managing and Collaborating on Software

Flashcards about Version Control, Git, and Properties in Java

Version Control Systems

Systems that track changes to a file, allowing storage of different versions, reversion to older versions, and collaboration.

Change (or diff, delta)

A modification to a file, often line-based for software and file-based for binaries.

Commit

A collection of changes submitted to the repository, accompanied by a message explaining the changes.

Version (or revision)

Each state of the system after a commit, typically with a unique identifier.

Head

The most recent commit to a repository or a branch of it.

Good Commit Messages

Explain the "why" (issues, requirements, necessity) and the "what" (summarize changes, underlying principle, illustrative description).

Repository (repo)

A location that stores a copy of all files, including source code, build files, and documentation.

Clone

Creating a local copy by copying (pulling) from the remote.

Pull

Getting changes from the remote.

Checkout

Pulling a specific version from the remote.

Push

Sending changes to the remote.

Branch

A duplicate of the files in a repository, developed independently for features, bug fixes, or releases, remaining within the repository.

Fork (GitHub)

Similar to a branch but independent of the original repository, copying all branches and potentially having a different owner.

Merge Conflict

Occurs when the system cannot automatically merge files due to conflicting changes on the same lines or files, requiring manual intervention.

Git

Created by Linus Torvalds in 2005 for Linux kernel development, it is the most widely used version control system.

git clone [url]

Copies the remote repository.

git add [files | .]

Adds specific or all files to the staging area.

git commit –m [msg]

Snapshots the staging area and creates a commit with a message.

git push

Pushes committed changes to the remote repository.

git status

Views the status of files in the working directory and staging area.

git diff

Shows differences between the staging area and working directory.

git log

Shows the commit history.

git pull

Gets updates from the remote and tries to merge them.

Managing settings and variations (in space)

Used to define and manage settings of a program, such as specific properties, configuration options, and hardware constraints.