Skip to content

Commit 6f3be34

Browse files
committed
fix: resolve merge conflicts
2 parents 12a799d + 8c52d46 commit 6f3be34

88 files changed

Lines changed: 29266 additions & 2214 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.husky/pre-commit

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
#!/bin/sh
22
# Load nvm if available
3+
# Try to load nvm (non-blocking)
34
export NVM_DIR="$HOME/.nvm"
4-
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
5-
# Use Node 20 if available (or install if needed)
6-
if [ -f .nvmrc ]; then
7-
nvm use 20 2>/dev/null || nvm install 20 && nvm use 20
5+
6+
if [ -s "$NVM_DIR/nvm.sh" ]; then
7+
. "$NVM_DIR/nvm.sh"
8+
nvm use >/dev/null 2>&1
9+
echo "Using Node via nvm"
10+
else
11+
echo "nvm not available, using system Node"
812
fi
913

1014
echo ""

0 commit comments

Comments
 (0)