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.
This commit is contained in:
ryan
2026-08-30 15:00:44 +08:00
parent 220c469ee7
commit a347c33608
11 changed files with 74 additions and 261 deletions
+2
View File
@@ -1,3 +1,5 @@
# Upstream Wavelet stack. Not the OpenFlare default.
# Use docker-compose.yaml (or `docker compose up`) for the product.
services:
wavelet:
build: