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
+3
View File
@@ -5,6 +5,9 @@
(`backend/{core,pkg,plugins}`)通过 `git fetch wavelet && git merge wavelet/main`
吸收(第一次接线已 merge `wavelet/feat/cordis-alignment`,待该分支合入上游 main
后改走 `wavelet/main`)。本目录、`frontend/` 与 `backend/cmd` 由本仓库持有。
合并前请 `git config include.path ../.gitconfig`(或 worktree 安全写法
`git config include.path "$(git rev-parse --show-toplevel)/.gitconfig"`),
以启用 `.gitattributes` 的 `merge=ours`。
```
backend/OpenFlare/