705608ae46
Some checks are pending
CI / test (map[image:macos-latest name:macos], 1, 4) (push) Waiting to run
CI / test (map[image:macos-latest name:macos], 2, 4) (push) Waiting to run
CI / test (map[image:macos-latest name:macos], 3, 4) (push) Waiting to run
CI / test (map[image:macos-latest name:macos], 4, 4) (push) Waiting to run
CI / test (map[image:windows-latest name:windows], 1, 4) (push) Waiting to run
CI / test (map[image:windows-latest name:windows], 2, 4) (push) Waiting to run
CI / test (map[image:windows-latest name:windows], 3, 4) (push) Waiting to run
CI / test (map[image:windows-latest name:windows], 4, 4) (push) Waiting to run
CI / merge-reports (push) Blocked by required conditions
14 lines
569 B
Diff
14 lines
569 B
Diff
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
|