Merge origin/main, keeping local content (May Sprint 5 commit superseded)

Browse Source

The May 10 commit on origin/main (8a1db81, "Sprint 5 - Meta Systems + Polish")
diverged from this local clone, which had its own independently-evolved CCGS
setup, GDDs, and Unity configuration. Per explicit user decision, local content
wins for every overlapping file; origin/main's unique history is preserved in
this merge's parents (recoverable via 8a1db81) rather than rewritten.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

...

This commit is contained in:

jimmyabv

2026-06-20 10:08:59 -03:00

co-authored by Claude Sonnet 4.6

parent ab31bba21e 8a1db81d8f

commit 893e513486

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available