pre-push git hook script for merge-conflict

Viewed 19

I was trying to merge a branch to another branch. But got an merge conflict error. I know resolved the error by following some Tutorial. But I was thinking of writing some script in pre-comit or in pre-push hooks that will check itself about merge conflicts before commit or push. Can someone help me with this??

0 Answers
Related