Is there a way to keep two branches from merging in git

Question

I would like to be able to keep two separate branches in a git repo that cannot accidentally be merged even though the branches may contain similar content.

Is there

Answer 1

Note that a git merge with auto-commit would not call the pre-commit hook. See "git merge auto-commit doesn't fire pre-commit hook"

Merge calls commit_tree directly, so the standard commit hooks are bypassed.

A Patch is in progress.