Resolve merge conflicts: preserve cacheable 1.10.0 upgrade with main branch updates#34
Merged
warengonzaga merged 6 commits intosnyk-upgrade-10bd67fe3fceb20559f634d1f2c3e8f8from Jul 6, 2025
Conversation
Snyk has created this PR to upgrade @keyv/redis from 4.3.2 to 4.4.0. See this package in yarn: @keyv/redis See this project in Snyk: https://app.snyk.io/org/wgtechlabs/project/4eab2a11-f9a2-4f5e-8cb2-e5b2870b7a5a?utm_source=github&utm_medium=referral&page=upgrade-pr
Snyk has created this PR to upgrade dotenv from 16.4.7 to 16.5.0. See this package in yarn: dotenv See this project in Snyk: https://app.snyk.io/org/wgtechlabs/project/4eab2a11-f9a2-4f5e-8cb2-e5b2870b7a5a?utm_source=github&utm_medium=referral&page=upgrade-pr
…2dca438601789a6 [Snyk] Upgrade dotenv from 16.4.7 to 16.5.0
…2bbfc103674395d [Snyk] Upgrade @keyv/redis from 4.3.2 to 4.4.0
Copilot
AI
changed the title
[WIP] Resolve merge conflicts for Snyk upgrade (cacheable 1.8.9 → 1.10.0) in PR #30
Resolve merge conflicts: preserve cacheable 1.10.0 upgrade with main branch updates
Jul 5, 2025
warengonzaga
approved these changes
Jul 6, 2025
…ilot/fix-db5be9b5-c9dd-4674-9fbc-0015f8f1f620
4de4ff5
into
snyk-upgrade-10bd67fe3fceb20559f634d1f2c3e8f8
2 of 3 checks passed
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
🔧 Merge Conflict Resolution
This PR resolves the merge conflicts in PR #30 that prevented the cacheable dependency upgrade from being merged with the latest main branch changes.
📋 Changes Made
Dependencies Updated
cacheable:^1.8.9→^1.10.0✨ (preserving the original PR intent)@keyv/redis:^4.3.1→^4.4.0(updated from main branch)dotenv:^16.4.7→^16.5.0(updated from main branch)Lockfile Updates
The
yarn.lockfile has been regenerated to reflect the resolved dependencies:cacheable@^1.10.0→ version 1.10.0hookified@^1.8.2→ version 1.10.0keyv@^5.3.3→ version 5.3.4🎯 Resolution Strategy
yarn installto ensure the lockfile accurately reflects all dependency changes✅ Verification
📊 Impact
Files changed: 2 files, 15 insertions(+), 53 deletions(-)
package.json: Updated dependency versionsyarn.lock: Streamlined with correct dependency treeThis resolution ensures that the security and functionality benefits of the cacheable upgrade are preserved while maintaining compatibility with the latest main branch changes.
Closes #30
💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.