Add enhanced sync script and collaborative workflow documentation

COLLABORATIVE_WORKFLOW.md

@@ -0,0 +1,170 @@
+# Collaborative Workflow with Dual Repositories
+
+This project is configured to sync with both **Hugging Face** and **Azure DevOps** repositories. This guide explains how to work collaboratively with your team.
+
+## Repository Configuration
+
+- **Origin (Hugging Face)**: `https://huggingface.co/spaces/levalencia/docling`
+- **Azure DevOps**: `https://element61.visualstudio.com/ZAS%20pati%C3%ABntvriendelijke%20brief/_git/streamlit_test_app_medicationlist`
+
+## Recommended Workflow
+
+### For You (Project Owner)
+
+#### Daily Workflow
+1. **Before starting work**: Run the enhanced sync script
+   ```bash
+   ./sync_repos_enhanced.sh
+   ```
+
+2. **Make your changes** and commit them
+   ```bash
+   git add .
+   git commit -m "Your commit message"
+   ```
+
+3. **Sync to both repositories**
+   ```bash
+   ./sync_repos_enhanced.sh "Your commit message"
+   ```
+
+#### When Colleagues Have Made Changes
+The enhanced script will automatically:
+- Fetch changes from both repositories
+- Merge any new commits
+- Handle conflicts gracefully
+- Push your changes to both repositories
+
+### For Your Colleagues
+
+#### Option 1: Work on Azure DevOps Only (Recommended)
+Your colleagues should:
+1. Clone from Azure DevOps
+   ```bash
+   git clone https://element61.visualstudio.com/ZAS%20pati%C3%ABntvriendelijke%20brief/_git/streamlit_test_app_medicationlist.git
+   ```
+
+2. Make changes and push to Azure DevOps
+   ```bash
+   git add .
+   git commit -m "Colleague's changes"
+   git push origin main
+   ```
+
+3. You'll sync their changes when you run the enhanced sync script
+
+#### Option 2: Work on Both Repositories
+If colleagues need access to both repositories:
+1. Clone your repository
+   ```bash
+   git clone https://huggingface.co/spaces/levalencia/docling.git
+   ```
+
+2. Add Azure DevOps as a remote
+   ```bash
+   git remote add azure https://element61.visualstudio.com/ZAS%20pati%C3%ABntvriendelijke%20brief/_git/streamlit_test_app_medicationlist
+   ```
+
+3. Use the enhanced sync script for their changes too
+
+## Conflict Resolution
+
+### Scenario 1: Colleagues Work on Azure DevOps
+```
+Timeline:
+1. You make changes → Push to both repos
+2. Colleague makes changes → Push to Azure only
+3. You make more changes → Try to sync
+
+Result: Enhanced script will:
+- Fetch from Azure DevOps
+- Merge colleague's changes
+- Push your merged changes to both repos
+```
+
+### Scenario 2: Conflicts Occur
+If there are merge conflicts:
+1. The script will stop and show you which files have conflicts
+2. Manually resolve conflicts in the conflicted files
+3. Add resolved files: `git add .`
+4. Commit: `git commit -m "Resolve merge conflicts"`
+5. Run the sync script again
+
+### Scenario 3: Force Push Needed
+If you need to overwrite Azure DevOps changes:
+```bash
+./sync_repos_enhanced.sh "Your message" --force-azure
+```
+
+⚠️ **Warning**: Only use force push when you're sure you want to overwrite Azure DevOps changes!
+
+## Best Practices
+
+### Communication
+- **Designate a primary repository**: Decide which repo is the "source of truth"
+- **Coordinate pushes**: Let team know when you're about to sync
+- **Use meaningful commit messages**: Help track what changes were made
+
+### Workflow Tips
+- **Always sync before starting work**: Prevents conflicts
+- **Test changes locally**: Before pushing to either repository
+- **Backup important work**: Before force pushing
+- **Use feature branches**: For major changes to avoid conflicts
+
+### Repository Roles
+- **Hugging Face**: Primary development and deployment
+- **Azure DevOps**: Team collaboration and backup
+
+## Troubleshooting
+
+### Common Issues
+
+#### "Push Rejected" Error
+```bash
+# Fetch and merge first
+git fetch azure
+git merge azure/main
+
+# Then push
+git push azure main
+```
+
+#### Merge Conflicts
+```bash
+# See conflicted files
+git status
+
+# Resolve conflicts manually, then
+git add .
+git commit -m "Resolve conflicts"
+```
+
+#### Force Push Safety
+```bash
+# Check what you're about to overwrite
+git log azure/main --oneline -5
+
+# Then force push if safe
+./sync_repos_enhanced.sh "Your message" --force-azure
+```
+
+### Emergency Recovery
+If something goes wrong:
+1. **Don't panic**: Git keeps history
+2. **Check both repositories**: See which has the latest changes
+3. **Reset if needed**: `git reset --hard <commit-hash>`
+4. **Re-apply changes**: If you lost work, check git reflog
+
+## Scripts Available
+
+- `sync_repos.sh`: Basic sync script (original)
+- `sync_repos_enhanced.sh`: Enhanced script for collaborative work (recommended)
+
+## Team Guidelines
+
+1. **Primary Developer (You)**: Use enhanced sync script, coordinate with team
+2. **Colleagues**: Work on Azure DevOps, communicate changes
+3. **Everyone**: Use meaningful commit messages, test before pushing
+4. **Emergency**: Contact primary developer before force pushing
+
+This setup allows flexible collaboration while maintaining code integrity across both repositories. 

sync_repos_enhanced.sh

@@ -0,0 +1,132 @@
+#!/bin/bash
+
+# Enhanced sync script for collaborative work with both Hugging Face and Azure DevOps
+# Usage: ./sync_repos_enhanced.sh [commit_message] [--force-azure]
+
+set -e  # Exit on any error
+
+# Colors for output
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+BLUE='\033[0;34m'
+NC='\033[0m' # No Color
+
+# Parse arguments
+COMMIT_MSG=${1:-"Auto-sync: $(date '+%Y-%m-%d %H:%M:%S')"}
+FORCE_AZURE=false
+
+if [[ "$2" == "--force-azure" ]]; then
+    FORCE_AZURE=true
+fi
+
+echo -e "${GREEN}🔄 Starting enhanced repository sync...${NC}"
+echo -e "${BLUE}📝 Commit message: ${COMMIT_MSG}${NC}"
+echo -e "${BLUE}🔧 Force Azure push: ${FORCE_AZURE}${NC}"
+
+# Check if we're in a git repository
+if ! git rev-parse --git-dir > /dev/null 2>&1; then
+    echo -e "${RED}❌ Error: Not in a git repository${NC}"
+    exit 1
+fi
+
+# Function to check for conflicts
+check_conflicts() {
+    if git ls-files -u | grep -q .; then
+        echo -e "${RED}❌ Merge conflicts detected! Please resolve them manually.${NC}"
+        echo -e "${YELLOW}   Run: git status to see conflicted files${NC}"
+        echo -e "${YELLOW}   After resolving: git add . && git commit${NC}"
+        exit 1
+    fi
+}
+
+# Function to fetch and merge from remote
+fetch_and_merge() {
+    local remote_name=$1
+    local branch_name=${2:-main}
+    
+    echo -e "${GREEN}📥 Fetching from ${remote_name}...${NC}"
+    git fetch $remote_name
+    
+    # Check if there are new commits on the remote
+    local local_commit=$(git rev-parse HEAD)
+    local remote_commit=$(git rev-parse $remote_name/$branch_name)
+    
+    if [ "$local_commit" != "$remote_commit" ]; then
+        echo -e "${YELLOW}⚠️  New commits detected on ${remote_name}. Attempting merge...${NC}"
+        
+        # Try to merge
+        if git merge $remote_name/$branch_name --no-edit; then
+            echo -e "${GREEN}✅ Successfully merged changes from ${remote_name}${NC}"
+        else
+            echo -e "${RED}❌ Merge failed. Please resolve conflicts manually.${NC}"
+            echo -e "${YELLOW}   Run: git status to see conflicted files${NC}"
+            echo -e "${YELLOW}   After resolving: git add . && git commit${NC}"
+            exit 1
+        fi
+    else
+        echo -e "${GREEN}✅ ${remote_name} is up to date${NC}"
+    fi
+}
+
+# Check for uncommitted changes
+if ! git diff-index --quiet HEAD --; then
+    echo -e "${YELLOW}⚠️  You have uncommitted changes. Please commit them first.${NC}"
+    echo -e "${YELLOW}   Run: git add . && git commit -m \"your message\"${NC}"
+    exit 1
+fi
+
+# Fetch and merge from both remotes before pushing
+echo -e "${GREEN}🔄 Syncing with remote repositories...${NC}"
+fetch_and_merge "origin" "main"
+fetch_and_merge "azure" "main"
+
+# Check for conflicts after merges
+check_conflicts
+
+# Add all changes and commit if there are any
+if ! git diff-index --quiet HEAD --; then
+    echo -e "${GREEN}📦 Adding and committing changes...${NC}"
+    git add .
+    git commit -m "$COMMIT_MSG"
+fi
+
+# Push to Hugging Face (origin)
+echo -e "${GREEN}🚀 Pushing to Hugging Face (origin)...${NC}"
+if git push origin main; then
+    echo -e "${GREEN}✅ Successfully pushed to Hugging Face${NC}"
+else
+    echo -e "${RED}❌ Failed to push to Hugging Face${NC}"
+    exit 1
+fi
+
+# Push to Azure DevOps (azure)
+echo -e "${GREEN}🚀 Pushing to Azure DevOps (azure)...${NC}"
+if [ "$FORCE_AZURE" = true ]; then
+    echo -e "${YELLOW}⚠️  Force pushing to Azure DevOps...${NC}"
+    if git push azure main --force; then
+        echo -e "${GREEN}✅ Successfully force pushed to Azure DevOps${NC}"
+    else
+        echo -e "${RED}❌ Failed to force push to Azure DevOps${NC}"
+        exit 1
+    fi
+else
+    if git push azure main; then
+        echo -e "${GREEN}✅ Successfully pushed to Azure DevOps${NC}"
+    else
+        echo -e "${YELLOW}⚠️  Regular push failed. You can:${NC}"
+        echo -e "${YELLOW}   1. Run: ./sync_repos_enhanced.sh \"$COMMIT_MSG\" --force-azure${NC}"
+        echo -e "${YELLOW}   2. Or manually resolve conflicts and push${NC}"
+        echo -e "${YELLOW}   3. Or fetch and merge from Azure first: git fetch azure && git merge azure/main${NC}"
+        exit 1
+    fi
+fi
+
+echo -e "${GREEN}🎉 Enhanced repository sync completed successfully!${NC}"
+echo -e "${GREEN}📊 Remotes configured:${NC}"
+git remote -v
+
+echo -e "${BLUE}💡 Tips for collaborative work:${NC}"
+echo -e "${BLUE}   • Always run this script before starting new work${NC}"
+echo -e "${BLUE}   • Use --force-azure only when you're sure you want to overwrite Azure changes${NC}"
+echo -e "${BLUE}   • Communicate with your team about which repository to use as primary${NC}"