kunthawat/moreminimore-vibe
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Add Dyad Update Management Guide and custom hooks for smart context
Some checks are pending
CI / test (map[image:macos-latest name:macos], 1, 4) (push) Waiting to run
Details
CI / test (map[image:macos-latest name:macos], 2, 4) (push) Waiting to run
Details
CI / test (map[image:macos-latest name:macos], 3, 4) (push) Waiting to run
Details
CI / test (map[image:macos-latest name:macos], 4, 4) (push) Waiting to run
Details
CI / test (map[image:windows-latest name:windows], 1, 4) (push) Waiting to run
Details
CI / test (map[image:windows-latest name:windows], 2, 4) (push) Waiting to run
Details
CI / test (map[image:windows-latest name:windows], 3, 4) (push) Waiting to run
Details
CI / test (map[image:windows-latest name:windows], 4, 4) (push) Waiting to run
Details
CI / merge-reports (push) Blocked by required conditions
Details

Browse Source
This commit is contained in:
Kunthawat Greethong
2025-12-05 20:01:06 +07:00
parent 73fc42bf4f
commit 705608ae46
7 changed files with 573 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
dyad-backup-20251205-195655/last-changes.diff Normal file
View File

@@ -0,0 +1,13 @@
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