husky-conflict-hook's Introduction

husky-conflict-hook used to check for git conflict by the keyword <<<<<<< HEAD

Using npm:

# Install dependency
$ npm i husky-conflict-hook -D

# It is based on husky and lint-staged. Usually, we have already install husky and lint-staged, so I didn't put them in the dependencies. So you can also install them individually. Due to different versions of husky, the configuration of husky may be slightly different. For details, it depends on the documents of different versions of husky

$ npm i husky lint-staged -D

# its option in package.json is
```json
{
    "lint-staged": {
        "*": "husky-conflict-hook"
    },
}
#  "*" means that every file in the git staged will be checked

Links

husky-conflict-hook's People

Contributors

Stargazers

Watchers

husky-conflict-hook's Issues

env: node\r: No such file or directory

# git commit -m ''

husky > pre-commit (node v12.13.0)
✔ Preparing...
⚠ Running tasks...
  ❯ Running tasks for *
    ✖ husky-conflict-hook [FAILED]
  ↓ No staged files match *.{js,vue,ts} [SKIPPED]
  ↓ No staged files match *.{css,vue,scss} [SKIPPED]
↓ Skipped because of errors from tasks. [SKIPPED]
✔ Reverting to original state because of errors...
✔ Cleaning up...

✖ husky-conflict-hook:
env: node\r: No such file or directory
husky > pre-commit hook failed (add --no-verify to bypass)

There is no such /usr/bin/env in my local machine which throws above error.

Recommend Projects