-
Notifications
You must be signed in to change notification settings - Fork 7
Expand file tree
/
Copy path.gitattributes
More file actions
18 lines (16 loc) · 978 Bytes
/
Copy path.gitattributes
File metadata and controls
18 lines (16 loc) · 978 Bytes
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
# Git Attributes Configuration
# Use custom merge driver for pnpm-lock.yaml
# This prevents manual merge conflicts in the lockfile by regenerating it.
#
# ⭐ CONTRIBUTOR-FACING, with ZERO CI consumers (objectui#6436, ruled 2026-08-27).
# An attribute only names a driver; it does not define one. The definition lives
# in each contributor's local git config -- CONTRIBUTING.md, "Configure Git Merge
# Driver for pnpm-lock.yaml" -- and no workflow defines it any more, because no
# workflow performs a merge git carries out on the runner. Keep this line: with it
# a conflicting lockfile merge is regenerated by pnpm; without it the same merge
# leaves conflict markers INSIDE pnpm-lock.yaml, and a hand-resolved lockfile is a
# high-blast-radius artifact that fails far from its cause.
pnpm-lock.yaml merge=pnpm-merge
# Keep Shadcn components as generated vendor code
packages/components/src/ui/** linguist-generated=true
packages/components/src/ui/** linguist-readonly=true