Rebase is an operation in the version control system Git that moves the commits of one branch and reapplies them on top of a different base commit. It is typically used to place a working branch on top of the latest state of the original branch, incorporating upstream changes while keeping one's own changes after them.
Merge, which serves a similar purpose, creates a separate merge commit that preserves the branching history, whereas rebase creates new commits and produces a linear history. When changes from both sides overlap, conflicts arise that must be resolved by a person or a tool. Rebasing is commonly used to bring a forked repository up to date with its upstream in open source projects.