Git pre-commit hooks

Pre-commit Git related hooks.

• merge-conflict: Checks if your branch has merge conflicts with the master branch.

Installation

Add the following to your project's .pre-commit-config.yaml:

-    repo: https://git.shore.co.il/nimrod/git-pre-commit.git
     sha: v0.1.1
     hooks:
     - id: merge-conflict
       args: ['production'] # In case the branch to check against is NOT master.
       always_run: True

License

This software is licensed under the MIT license (see the LICENSE.txt file).

Author information

Nimrod Adar, contact me or visit my website. Patches are welcome via git send-email. The repository is located at https://git.shore.co.il/nimrod/.