From ae6b1bee86c5067f4b3025745654cf83798e5b05 Mon Sep 17 00:00:00 2001 From: Quinn Ftw Date: Tue, 23 Dec 2025 19:11:37 -0800 Subject: [PATCH] fix: Allow unrelated histories in releases sync MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The releases/ repository has a separate git history from codebase/, so the first merge requires --allow-unrelated-histories flag. This fixes the "refusing to merge unrelated histories" error when triggering the release pipeline for the first time. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.5 --- infrastructure/scripts/release-deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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