conflict-detector (npm): A precommit hook to warn you about merge conflicts introduced with other branches of your app
Keywords: git|conflicts|merge|postcommit|hook