Learn
Rebase
Replay your commits on top of a newer mainMain is the shared branch this site treats as the current source. so your branchA branch is a named line of snapshots, so a new idea can grow beside the shared line. is up to date before a tipThe tip is the newest saved snapshot on a branch, the one a reviewer can check out..
Why this word exists
MainMain is the shared branch this site treats as the current source. keeps moving while you cook. Rebase replays your commits on top of a newer main so your branchA branch is a named line of snapshots, so a new idea can grow beside the shared line. is current before a tipThe tip is the newest saved snapshot on a branch, the one a reviewer can check out..
It is Git craft for a cleaner history — still human-driven, still not a deployA deploy puts a built site on the server people open in a browser. by itself.
Where you will meet it
How-to-tipThe tip is the newest saved snapshot on a branch, the one a reviewer can check out. notes may ask for rebase before opening a PRA pull request is a review page that asks a human to look at a branch before those changes join main.. Conflicts can appear; humans resolve them.
Examples
- You rebase the glossary branchA branch is a named line of snapshots, so a new idea can grow beside the shared line. onto origin/mainMain is the shared branch this site treats as the current source. before Laser reviews.
- Rebase then tipThe tip is the newest saved snapshot on a branch, the one a reviewer can check out. keeps the tip trainA line of finished changes waiting to be tipped (reviewed and shipped) one after another. from merging stale snapshots.
- Rebase is not the same as mergeA merge brings another branch’s snapshots onto the branch you are on, usually after a person agrees., but both can end in a conflictWhen two branches changed the same line and a human must choose which version to keep during a merge. pause.
Fetched 2026-09-23 CT.