Skip to content

Commit 7379cb1

Browse files
committed
fix: fix merge.schemas.driver
Although it turns out this doesn't work with rebases anyway.
1 parent fbb5ed6 commit 7379cb1

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

scripts/setup-merge-driver.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
# When SCHEMAS.md has conflicts, it will be regenerated from lexicon files.
55
# This script should be auto-run on npm install via the "prepare" script.
66

7-
git config --local merge.schemas.driver "npm run gen-schemas && git add -u -- %A"
7+
git config --local merge.schemas.driver "npm run gen-schemas-md && git add -u -- %A"
88

99
echo "✅ Configured merge driver for SCHEMAS.md"

0 commit comments

Comments
 (0)