tcjlj/OpenFlare
1
0
Fork 0
mirror of https://github.com/Rain-kl/OpenFlare.git synced 2026-10-11 09:46:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(cordis): persist merge.ours and isolate wavelet extras

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
docker-compose.yml
+6
View File
@@ -0,0 +1,6 @@
# Isolated Wavelet compose filename.
# OpenFlare's default stack is docker-compose.yaml (`docker compose` prefers
# that name over this one). This stub is kept so `git merge wavelet/main`
# cannot restore a wavelet product stack under the default compose name.
include:
- path: docker-compose.yaml