diff --git a/infrastructure/scripts/release-deploy.sh b/infrastructure/scripts/release-deploy.sh index 2210e7c41..5f6daad2f 100755 --- a/infrastructure/scripts/release-deploy.sh +++ b/infrastructure/scripts/release-deploy.sh @@ -182,7 +182,7 @@ sync_to_releases() { # Merge main into releases log_info "Merging main → releases..." - git merge main --no-ff -m "Merge main into releases for deployment" || { + git merge main --no-ff --allow-unrelated-histories -m "Merge main into releases for deployment" || { log_error "Merge conflict detected - manual resolution required" log_error "Resolve conflicts in: $RELEASES_DIR" exit 1