chore(deps): update all non-major dependencies #384
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
❌ Deploy Preview for stacks-buddy failed. Why did it fail? →
|
commit: |
chrisbbreuer
added a commit
that referenced
this pull request
Oct 15, 2025
This critical fix prevents the "hundreds of deleted PRs" problem by ensuring PR branches are kept up-to-date with main before applying new dependency updates. Previously, when updating an existing PR: 1. Checkout main and generate updates 2. Commit updates to PR branch (WITHOUT merging main first) This caused PR branches to fall behind main, creating merge conflicts and causing buddy-bot to close and recreate PRs instead of updating them. Now the flow is: 1. Checkout main and generate updates 2. Checkout PR branch 3. Merge main into PR branch to resolve conflicts 4. Apply the new dependency updates 5. Commit and push The merge uses a conflict resolution strategy: - First tries a clean merge - If conflicts occur, retries with '-X theirs' to accept main's changes - Then our file updates overwrite with correct dependency versions This ensures existing PRs like #384 are properly updated instead of being closed and recreated, preventing hundreds of deleted PRs over time. Fixes the issue where PR #384 has CONFLICTING merge state. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <[email protected]>
chrisbbreuer
added a commit
that referenced
this pull request
Oct 15, 2025
This completes the fix for the "hundreds of deleted PRs" problem by ensuring PR branches ALWAYS stay up-to-date with main, even when there are no file content differences to commit. Previously: - Detected no content differences between branches - Skipped calling commitChanges entirely - PR branch never got merged with main - PR stayed in CONFLICTING state (e.g., PR #384) Now: - Always calls commitChanges, even with no content differences - When no changes: commits with empty file array and message "chore: merge main to keep branch up-to-date" - This triggers the merge logic in commitChangesWithGit - PR branches stay current with main, preventing CONFLICTING status This implements the user's directive: "yes always do that when possible!" to always merge main into PR branches regardless of file content differences. Together with the previous commit that added merge logic to commitChangesWithGit, this ensures existing PRs are properly updated instead of being closed and recreated. Fixes the issue where PR #384 has CONFLICTING merge state. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <[email protected]>
chrisbbreuer
deleted the
buddy-bot/update-non-major-updates-1759810080695
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR contains the following updates:
v2→v2.0.2release.ymlRelease Notes
oven-sh/setup-bun
v2 → v2.0.2
Visit oven-sh/setup-bun for release notes.
📊 Package Statistics
Configuration
📅 Schedule: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).
🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.
♻ Rebasing: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.
🔕 Ignore: Close this PR and you won't be reminded about this update again.
This PR was generated by Buddy 🤖