Rebasing and history

Rebase replays your commits on top of another base, producing a linear history. It rewrites commit IDs, so only rebase branches that are yours and not shared.

git switch feature/pricing
git fetch origin
git rebase origin/main
git rebase -i HEAD~3
# squash, reword or reorder in the editor
git rebase --abort
git push --force-with-lease

• rebase keeps history linear and reviews focused.
• Interactive rebase edits the last N commits before a pull request.
• Force-with-lease refuses to overwrite someone else's new commits.
• Never rebase main or any branch other people build on.