Enhance deployment workflow port management and Git handling

- Improve port termination using `lsof` and `kill` for more robust process management
- Add Git reset to handle potential merge conflicts during deployment
- Streamline deployment script with clearer, more concise commands

.github/workflows/deploy.yml

@@ -34,33 +34,29 @@ jobs:
           cd /var/www/Community_Management  # Navigate to your Django project directory
 
           echo "Starting deployment..."
-          
-          # Kill any process using port 80 (development server port)
-          fuser -k 80/tcp || true  # Ignore error if port isn't in use
 
+          # Kill any process using port 80
+          sudo lsof -i :80 | awk 'NR>1 {print $2}' | xargs sudo kill -9 || true
           echo "Killed any processes using port 80"
 
-          # Set up virtual environment
+          # Ensure virtual environment is set up
           python3 -m venv venv
           source venv/bin/activate  # Activate virtual environment
 
-          # Pull the latest code from GitHub
+          # Handle Git conflicts
+          git reset --hard HEAD
           git pull origin main
-
           echo "Pulled latest code from GitHub"
 
-
           # Install the dependencies from the updated code
           pip install -r requirements.txt
 
           # Run database migrations
           python manage.py migrate
-
           echo "Ran database migrations"
 
           # Run the Django development server in the background (not recommended for production)
           nohup python manage.py runserver 0.0.0.0:80 > server.log 2>&1 &
-
           echo "Started Django development server"
 
         EOF