A precommit hook to warn you about merge conflicts introduced with other branches of your app
npm install conflict-detectorA postcommit hook to warn you about merge conflicts introduced with other branches of the repo.
``
npm i conflict-detector husky --save-dev
Add a line in your package.json:
`
"scripts": {
...
"postcommit": "conflict-detector",
...
},
If you realize a partial commit, the script will use the stash, therefore add an item on top of it.
Create a config file containing branches to protect instead of running on all of the branches.