mirror of
https://github.com/Rain-kl/OpenFlare.git
synced 2026-09-30 06:16:37 +08:00
ryan
a347c33608
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.
9 lines
263 B
Plaintext
9 lines
263 B
Plaintext
* -text
|
|
backend/OpenFlare/** merge=ours
|
|
frontend/** merge=ours
|
|
docs/changelog/** merge=ours
|
|
docs/superpowers/** merge=ours
|
|
.github/workflows/build-image.yml merge=ours
|
|
docker-compose.yml merge=ours
|
|
.gitconfig merge=ours
|