Merge Conflict

Copying the change from one commit onto another branch as a new commit, the standard way to backport a fix without merging everything else that came with it.

A tool that rewrites source code into one canonical layout automatically, ending style debates in code review and keeping diffs focused on what changed.

The listing of changes between two versions of a file, the algorithms that compute it, and the unified format that code review, patches, and merges are built on.

The two basic ways Git joins branches, by sliding a branch pointer forward or by recording a new commit with two parents, and how the choice shapes a project's history.

A branch created to develop one change in isolation before merging it back, a workflow that keeps the main line stable but grows riskier the longer the branch lives, since its divergence from everyone else's work compounds.

A Git extension that stores large binary files on a separate server and keeps small pointer files in the repository, so history stays light enough to clone.

Git's shelf for uncommitted work, which clears the working tree so you can switch tasks, and the reasons a throwaway commit or a second worktree is often the better shelf.

Git's tool for rewriting a series of commits before sharing them, reordering, combining, splitting, and rewording them so the history tells a clear story rather than recording every false start.

Validating changes against the state they will actually merge into, in order, rather than in isolation.

Replaying a branch's commits onto a new base, producing new commits with the same changes.

Two changes that merge cleanly and are incompatible in meaning.

A chain of dependent changes, each reviewed separately and merged in order.

The intermediate snapshot in Git between the working files and the next commit, which lets a developer choose exactly which changes go into each commit, down to individual lines.

Combining two lines of work by comparing both against their common ancestor.