diff --git a/update-dyad.sh b/update-dyad.sh index 2763b94..4d7da4c 100755 --- a/update-dyad.sh +++ b/update-dyad.sh @@ -78,7 +78,7 @@ git log --oneline HEAD..upstream/main --reverse # Attempt to merge print_status "Merging upstream changes into your branch..." -if git merge upstream/main -m "merge: update from upstream - $(date)"; then +if git merge upstream/main -m "merge: update from upstream - $(date)" --allow-unrelated-histories; then print_success "✅ Update completed successfully!" # Check for any conflicts that need manual resolution