lilith/platform-codebase
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: Allow unrelated histories in releases sync

Browse source 
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 <noreply@anthropic.com>
This commit is contained in:
Quinn Ftw 2025-12-23 19:11:37 -08:00
parent 4ef7eb29cd
commit ae6b1bee86
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
infrastructure/scripts/release-deploy.sh
View file

@ -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