3 Commits

Author	SHA1	Message	Date
ryan	a347c33608	chore(cordis): persist merge.ours and isolate wavelet extras ... Add a repo .gitconfig so merge=ours in .gitattributes can actually run. Disable the Wavelet canary image workflow and keep docker-compose.yaml as the OpenFlare default so a merge cannot ship the wrong product.	2026-08-30 15:00:44 +08:00
ryan	4fb47e65f4	chore(git): keep OpenFlare-owned paths on merge	2026-08-30 14:28:38 +08:00
ryan	b595154e46	gitattributes	2026-03-10 10:56:50 +08:00