Git, cloud & DevOps

What is Git merge vs rebase?

git merge combines branches by creating a merge commit and keeps history exactly as it happened; git rebase replays your commits on top of another branch for a linear history. Never rebase commits others have already pulled.