Merging is the process of merging a new set of code written into a larger codebase. Before this can happen, we have lots of layers of review by both bot and human.
Lintron is a bot that checks all code. Once that checks out, another developer, either on the project or not, is assigned to manually review the code. They can either leave feedback or merge the code in.
Deploying code involves pushing a codebase to a Heroku instance. We like using Codeship because it does this for us automatically when code is merged. Therefore, the new code gets pushed straight to staging, which is where our quality assurance (QA) team gets to work testing.