linsoftware.com
How to Check for Git Merge Conflicts in Travis CI
We use Travis for Continuous Integration (CI). In other words, we pay a bot called Travis to check our code before we deploy it live. Travis checks for things like PHP syntax errors and runs all …