Core jargon for software architecture, delivery, and engineering culture.
A named pointer to a line of commits in a repository, letting work proceed in parallel without touching the main codebase.
A saved snapshot of changes to a repository, along with a message describing what changed and why.
When two branches have made incompatible changes to the same part of the same file, requiring a human to decide what the final version should be.
Combining the changes from one branch into another, producing a unified history that includes both lines of work.
A request to merge a branch into another, used as the gate for code review before changes land in the main branch.
Replaying your commits on top of a different base commit, rewriting the branch history so it looks like you started from the latest point.