search

pixelastic / aberlaas

🚀 Scaffolding npm projects with test, lint and release scripts
MIT License
0 stars 0 forks source link

Detect marker conflicts #7

Open pixelastic opened 5 years ago

pixelastic commented 5 years ago

Aberlaas should detect conflict markers and not allow committing them

pixelastic commented 4 years ago

There does not seem to have any lint-staged plugin that does that, but one could call git diff --check to check for markers

pixelastic commented 3 years ago

I should be able to code that with a custom aberlaas script

Source: https://delicious-insights.com/fr/articles/git-hooks/

This should be added to the aberlaas:precommit command, and should be applied whenever a commit is done. It will get the diff, and if it contains <<<< / >>>> symbols, should block it.