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

Through the use of Git’s interactive rebase feature, I will squash both the develop and feature branches down to one commit. A post-squash merge will then bring both develop and feature branches into ...

I'm trying to bring them into modern times by setting up branching, protected master branch, PRs, approvals needed to merge, etc.