Enhance deployment script to check for merge conflicts before stashing local changes; update various JSON and PDF files with new timestamps and IDs, including new Spielplaene PDFs and revised config content.

deploy-production.sh

@@ -9,6 +9,12 @@ echo ""
 # 1. Handle local changes and Git Pull
 echo "1. Handling local changes and pulling latest from git..."
 
+# Check if there are merge conflicts first
+if [ -n "$(git status --porcelain | grep '^UU\|^AA\|^DD')" ]; then
+  echo "   Resolving existing merge conflicts..."
+  git reset --hard HEAD
+fi
+
 # Stash any local changes (including production data)
 echo "   Stashing local changes..."
 git stash push -m "Production deployment stash $(date)"