Glossary: Command Line and Git

Squash and merge

Also written: Rebase and merge

Alternative ways to merge a pull request on GitHub. Squash and merge combines the branch's commits into one, while Rebase and merge copies them onto `main` without a merge commit.