gitea-admin/gh-christianlouis-docuelevate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: merge main into feature branch - resolve all merge conflicts cleanly

Browse Source 
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>
This commit is contained in:
copilot-swe-agent[bot]
2026-03-17 16:14:45 +00:00
parent 342e2d1614
commit a08b103271
37 changed files with 1814 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RUNTIME_INFO
+6 -6
View File
@@ -1,10 +1,10 @@
DocuElevate Build Information
==============================
Version: 0.155.0
Build Date: 2026-03-17T11:23:05Z
Git Commit: 30c2e9afefc57c8d1e19548afec7475f5a838f24
Git Short SHA: 30c2e9a
Version: 0.156.0
Build Date: 2026-03-17T13:12:02Z
Git Commit: a3c657b947d774255ede33bcf6143ab60c69d1ac
Git Short SHA: a3c657b
Git Branch: main
Commit Date: 2026-03-17T12:22:07+01:00
Build Timestamp: 2026-03-17T11:23:05Z
Commit Date: 2026-03-17T14:11:41+01:00
Build Timestamp: 2026-03-17T13:12:02Z
==============================