Commit 913aca1d authored by Lin Jen-Shin's avatar Lin Jen-Shin 🔴 Committed by Rémy Coutable

Make sure we didn't commit conflicts

parent 0bbf0064
#!/bin/sh
output=`git ls-files -z | grep -zvE '\.(rb|js|haml)$' | xargs -0n1 grep -HEn '^<<<<<<< '`
echo $output
test -z "$output"
...@@ -11,7 +11,8 @@ tasks = [ ...@@ -11,7 +11,8 @@ tasks = [
%w[bundle exec rake brakeman], %w[bundle exec rake brakeman],
%w[bundle exec license_finder], %w[bundle exec license_finder],
%w[yarn run eslint], %w[yarn run eslint],
%w[bundle exec rubocop --require rubocop-rspec] %w[bundle exec rubocop --require rubocop-rspec],
%w[scripts/lint-conflicts.sh]
] ]
failed_tasks = tasks.reduce({}) do |failures, task| failed_tasks = tasks.reduce({}) do |failures, task|
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment