Skip to content

Ka-Houl/husky-conflict-hook

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 

History

8 Commits
 
 
 
 
 
 
 
 
 
 
 
 

Repository files navigation

English | 简体中文

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

About

husky hook used to check for git conflict

Resources

Stars

Watchers

Forks

Releases

No releases published

Packages

No packages published