Catch Production merge conflicts before they occur with git-merge-tree.

Ahh…the dreaded merge conflict. No developer likes to see those red squiggly lines after working hard on their feature branch and merging to their target branch. Because it means there’s more work to do, and you have to go through the painful process...