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

Learn how to resolve Merge Conflicts in Git using this guide. Merge Conflicts can occur if the same parts of code are changed in different branches.

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