Merge origin/client into main. Resolve binary conflict in commonwealth.db by keeping main's version (latest ticket state). Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
35 lines
492 B
Plaintext
35 lines
492 B
Plaintext
# Build and cache
|
|
.cache/
|
|
server/target/
|
|
|
|
# Godot
|
|
client/.godot/
|
|
client/export/
|
|
client/reports/
|
|
client/*.import
|
|
|
|
# Database journal files (transient, not the DB itself)
|
|
db/commonwealth.db-wal
|
|
db/commonwealth.db-shm
|
|
|
|
# Python
|
|
__pycache__/
|
|
*.pyc
|
|
*.pyo
|
|
|
|
# OS
|
|
.DS_Store
|
|
Thumbs.db
|
|
|
|
# IDE
|
|
.idea/
|
|
.vscode/
|
|
*.swp
|
|
*.swo
|
|
|
|
# Claude Code internals (plans, session transcripts, local settings)
|
|
# Note: .claude/agents/ and .claude/skills/ ARE tracked
|
|
.claude/plans/
|
|
.claude/projects/
|
|
.claude/settings.json
|