 copilot-swe-agent[bot]
|
a08b103271
|
fix: merge main into feature branch - resolve all merge conflicts cleanly
Merges origin/main (v0.156.0) into the classification feature branch,
properly resolving all 23 merge conflicts:
- Auto-generated files (BUILD_DATE, VERSION, etc.): accept main's version
- Non-classification files (SharePoint, QR auth, session mgmt, mobile): accept main's version
- Classification files (api/__init__.py, models.py, migrations/env.py, conftest.py):
keep classification additions alongside main's content
Previously the branch was incorrectly removing files from main (SharePoint
integration, QR scanner, session management). This merge properly preserves
all main branch content while maintaining the classification feature additions.
Migration chain validated: 038_add_classification_rules chains from
037_add_user_sessions_and_qr_challenges.
Co-authored-by: christianlouis <361235+christianlouis@users.noreply.github.com>
|
2026-03-17 16:14:45 +00:00 |
|