Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Lockfile
#
# merge=binary tells git to never line-merge this file. A lockfile that git
# stitched together from two sides is not a valid lockfile — it just looks like
# one. On conflict git now stops and keeps our side, so the resolution has to be
# a deliberate `yarn install`, not a silent guess.
#
# linguist-generated collapses it in GitHub diffs, so a 4000-line lockfile churn
# stops burying the actual review.
yarn.lock merge=binary linguist-generated=true
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: '22'
node-version-file: '.nvmrc'
cache: 'yarn'

- name: Install dependencies
Expand Down
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
24
Loading
Loading