Auto-merging .gitignore
CONFLICT (content): Merge conflict in .gitignore
Auto-merging CLAUDE.md
CONFLICT (content): Merge conflict in CLAUDE.md
CONFLICT (modify/delete): QUICK_START.md deleted in main and modified in HEAD.  Version HEAD of QUICK_START.md left in tree.
Auto-merging apps/api/src/auth/__init__.py
CONFLICT (rename/delete): src/auth/tests/test_authentication.py renamed to apps/api/src/auth/tests/test_authentication.py in main, but deleted in HEAD.
CONFLICT (file location): src/scripts/insert-tickets-simple.ts added in HEAD inside a directory that was renamed in main, suggesting it should perhaps be moved to apps/api/src/scripts/insert-tickets-simple.ts.
CONFLICT (file location): src/scripts/link-everything.ts added in HEAD inside a directory that was renamed in main, suggesting it should perhaps be moved to apps/api/src/scripts/link-everything.ts.
CONFLICT (file location): src/scripts/verify-linear-structure.ts added in HEAD inside a directory that was renamed in main, suggesting it should perhaps be moved to apps/api/src/scripts/verify-linear-structure.ts.
Auto-merging docs/AZURE_DEPLOYMENT_DEV.md
CONFLICT (add/add): Merge conflict in docs/AZURE_DEPLOYMENT_DEV.md
Auto-merging requirements.txt
CONFLICT (content): Merge conflict in requirements.txt
Auto-merging src/services/file-ingestion/.env.example
CONFLICT (add/add): Merge conflict in src/services/file-ingestion/.env.example
Auto-merging src/services/file-ingestion/Dockerfile
CONFLICT (add/add): Merge conflict in src/services/file-ingestion/Dockerfile
Auto-merging src/services/file-ingestion/ai/__init__.py
CONFLICT (add/add): Merge conflict in src/services/file-ingestion/ai/__init__.py
Auto-merging src/services/file-ingestion/ai/claude_service.py
CONFLICT (add/add): Merge conflict in src/services/file-ingestion/ai/claude_service.py
Auto-merging src/services/file-ingestion/ai/embeddings_service.py
CONFLICT (add/add): Merge conflict in src/services/file-ingestion/ai/embeddings_service.py
Auto-merging src/services/file-ingestion/ai/vision_service.py
CONFLICT (add/add): Merge conflict in src/services/file-ingestion/ai/vision_service.py
Auto-merging src/services/file-ingestion/ai/whisper_service.py
CONFLICT (add/add): Merge conflict in src/services/file-ingestion/ai/whisper_service.py
Auto-merging src/services/file-ingestion/api/auth.py
CONFLICT (add/add): Merge conflict in src/services/file-ingestion/api/auth.py
Auto-merging src/services/file-ingestion/api/routes.py
CONFLICT (add/add): Merge conflict in src/services/file-ingestion/api/routes.py
Auto-merging src/services/file-ingestion/api/websocket.py
CONFLICT (add/add): Merge conflict in src/services/file-ingestion/api/websocket.py
Auto-merging src/services/file-ingestion/config.py
CONFLICT (add/add): Merge conflict in src/services/file-ingestion/config.py
Auto-merging src/services/file-ingestion/core/cache_service.py
CONFLICT (add/add): Merge conflict in src/services/file-ingestion/core/cache_service.py
Auto-merging src/services/file-ingestion/core/database.py
CONFLICT (add/add): Merge conflict in src/services/file-ingestion/core/database.py
Auto-merging src/services/file-ingestion/core/job_queue.py
CONFLICT (add/add): Merge conflict in src/services/file-ingestion/core/job_queue.py
Auto-merging src/services/file-ingestion/core/search_service.py
CONFLICT (add/add): Merge conflict in src/services/file-ingestion/core/search_service.py
Auto-merging src/services/file-ingestion/docker-compose.yml
CONFLICT (add/add): Merge conflict in src/services/file-ingestion/docker-compose.yml
Auto-merging src/services/file-ingestion/extractors/__init__.py
CONFLICT (add/add): Merge conflict in src/services/file-ingestion/extractors/__init__.py
Auto-merging src/services/file-ingestion/extractors/archive_extractor.py
CONFLICT (add/add): Merge conflict in src/services/file-ingestion/extractors/archive_extractor.py
Auto-merging src/services/file-ingestion/extractors/email_extractor.py
CONFLICT (add/add): Merge conflict in src/services/file-ingestion/extractors/email_extractor.py
Auto-merging src/services/file-ingestion/extractors/image_extractor.py
CONFLICT (add/add): Merge conflict in src/services/file-ingestion/extractors/image_extractor.py
Auto-merging src/services/file-ingestion/extractors/pdf_extractor.py
CONFLICT (add/add): Merge conflict in src/services/file-ingestion/extractors/pdf_extractor.py
Auto-merging src/services/file-ingestion/extractors/video_extractor.py
CONFLICT (add/add): Merge conflict in src/services/file-ingestion/extractors/video_extractor.py
Auto-merging src/services/file-ingestion/indexing/elasticsearch_service.py
CONFLICT (add/add): Merge conflict in src/services/file-ingestion/indexing/elasticsearch_service.py
Auto-merging src/services/file-ingestion/indexing/indexing_service.py
CONFLICT (add/add): Merge conflict in src/services/file-ingestion/indexing/indexing_service.py
Auto-merging src/services/file-ingestion/indexing/pinecone_service.py
CONFLICT (add/add): Merge conflict in src/services/file-ingestion/indexing/pinecone_service.py
Auto-merging src/services/file-ingestion/main.py
CONFLICT (add/add): Merge conflict in src/services/file-ingestion/main.py
Auto-merging src/services/file-ingestion/models/file.py
CONFLICT (add/add): Merge conflict in src/services/file-ingestion/models/file.py
Auto-merging src/services/file-ingestion/scripts/init_db.sql
CONFLICT (add/add): Merge conflict in src/services/file-ingestion/scripts/init_db.sql
Auto-merging src/services/file-ingestion/storage/azure_storage.py
CONFLICT (add/add): Merge conflict in src/services/file-ingestion/storage/azure_storage.py
Automatic merge failed; fix conflicts and then commit the result.