Merge master into dev/koko after patrol delete fixes
The merge keeps dev/koko patrol-delete asset fallback behavior while accepting the latest master feature work. Conflicts were limited to ignore rules, local environment/config artifacts, tracked pycache binaries, and the Flask main blueprint. Constraint: master and dev/koko both edited app/blueprints/main.py around brand and asset serving Rejected: Drop dev/koko asset fallback logic | patrol delete and rebuilt Vite assets still need hashed asset resolution across app/new_web_source locations Confidence: medium Scope-risk: broad Directive: app/.env remains a tracked local-config file in this repository; do not print or normalize secrets during conflict handling Tested: uv run python -m py_compile blueprints\\main.py amazon\\base.py amazon\\main.py Tested: uv run --group dev pytest tests\\test_amazon_base.py tests\\test_patrol_delete.py Not-tested: Full backend-java/frontend-vue test suites
This commit is contained in:
4
.gitignore
vendored
4
.gitignore
vendored
@@ -104,4 +104,6 @@ xlsx/
|
||||
.omx/
|
||||
.codex
|
||||
.rtk
|
||||
OPS_REDIS_MYSQL_OPTIMIZATION_NOTES.md
|
||||
OPS_REDIS_MYSQL_OPTIMIZATION_NOTES.md
|
||||
架构.md
|
||||
*ts.%
|
||||
|
||||
Reference in New Issue
Block a user