Learn how to merge two branches in Git. There are multiple ways to merge code in Git, including the Merge command and Pull Request.

When your git commit history gets long in the tooth, and you want to clean up your feature and topic branches before the merge to master, you’ll need the facilities of the Git squash commit feature.