-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy path.gitattributes
More file actions
23 lines (22 loc) · 988 Bytes
/
Copy path.gitattributes
File metadata and controls
23 lines (22 loc) · 988 Bytes
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
# Merge strategy for forks tracking zerostack as `upstream`.
#
# Files below are "customize" — every fork rebrands them and never wants
# them silently overwritten by `git merge upstream/main`. The `ours`
# driver picks the fork's version on conflict.
#
# To activate in a fork (one-time):
# git config merge.ours.driver true
#
# Without that config the lines below are inert, so zerostack itself
# keeps normal three-way merges.
#
# See docs/agent-rules.md for the full frozen / customize / extend split.
apps/web/src/lib/site.ts merge=ours
apps/web/src/app/layout.tsx merge=ours
apps/web/src/app/page.tsx merge=ours
apps/web/src/components/site-nav.tsx merge=ours
apps/web/src/components/site-footer.tsx merge=ours
README.md merge=ours
LICENSE merge=ours
.env.example merge=ours
package.json merge=ours