My git repository has two branches, \'master\' and \'dev\'.
Code committed to \'dev\' goes through an automated build process before it is tested. Code that passes this
You may want to use a commit-msg
hook that checks whether the word merge
occurs in the message for a tentative commit. Something like
grep -iq merge "$1" || exit 1
after a check for the branch. You may want to make the RE stricter than this. This is only a heuristic, of course, and anyone with write access to the central repo can circumvent this check.