merge: resolve conflicts keeping feature/bechmarks changes
This commit is contained in:
Executable → Regular
+1
-10
@@ -1,11 +1,2 @@
|
||||
#!/bin/sh
|
||||
. "$(dirname "$0")/_/husky.sh"
|
||||
|
||||
# Format all staged files with Prettier
|
||||
npm run format
|
||||
|
||||
# Lint and fix staged files
|
||||
# Lint and auto-fix staged files only (fast)
|
||||
npx lint-staged
|
||||
|
||||
# Run tests
|
||||
npm test
|
||||
|
||||
Executable → Regular
+1
@@ -1 +1,2 @@
|
||||
# Run full test suite before push
|
||||
npm test
|
||||
|
||||
Reference in New Issue
Block a user