mirror of
https://github.com/anomalyco/opencode.git
synced 2026-07-23 10:45:33 -04:00
Artur Do Lago
0aa693ba3f
Code changes: - Add Global.Path.source getter with AGENT_CORE_SOURCE env var support - Update status.ts to use Global.Path.source for script paths - Update setup.ts to use Global.Path.source for docker-compose lookup Documentation updates: - Remove hardcoded ~/.local/src/agent-core paths from all docs - Use generic or relative path references throughout - README.md, CLAUDE.md, OPS.md, USER_GUIDE.md, PROVIDERS.md updated Upstream merge protection: - Add .gitattributes with merge=ours for fork-specific files - Configure ours merge driver - Protects: README.md, CONTRIBUTING.md, CLAUDE.md, language READMEs, docs Deleted (fork cleanup): - README.zh-CN.md (Chinese Simplified) - README.zh-TW.md (Chinese Traditional) - CONTRIBUTING.md
20 lines
523 B
Plaintext
20 lines
523 B
Plaintext
# Files to preserve during upstream merges (use "ours" strategy)
|
|
# These are fork-specific customizations that should not be overwritten
|
|
|
|
# Fork-specific documentation
|
|
README.md merge=ours
|
|
CONTRIBUTING.md merge=ours
|
|
CLAUDE.md merge=ours
|
|
|
|
# Non-English READMEs (removed from this fork)
|
|
README.zh-CN.md merge=ours
|
|
README.zh-TW.md merge=ours
|
|
|
|
# Fork-specific configuration
|
|
.agent-core/agent-core.jsonc merge=ours
|
|
|
|
# Fork customizations in docs
|
|
docs/OPS.md merge=ours
|
|
docs/USER_GUIDE.md merge=ours
|
|
docs/PROVIDERS.md merge=ours
|