fix: resolve merge conflicts between dependabot production-deps bump and main#707
Closed
Copilot wants to merge 4 commits intodependabot/npm_and_yarn/production-dependencies-ee47afc39cfrom
Closed
Conversation
Bumps the production-dependencies group with 8 updates: | Package | From | To | | --- | --- | --- | | [lucide-react](https://github.com/lucide-icons/lucide/tree/HEAD/packages/lucide-react) | `0.563.0` | `0.564.0` | | [msw](https://github.com/mswjs/msw) | `2.12.9` | `2.12.10` | | [pino](https://github.com/pinojs/pino) | `10.3.0` | `10.3.1` | | [glob](https://github.com/isaacs/node-glob) | `13.0.1` | `13.0.3` | | [fumadocs-core](https://github.com/fuma-nama/fumadocs) | `16.5.2` | `16.6.1` | | [fumadocs-ui](https://github.com/fuma-nama/fumadocs) | `16.5.2` | `16.6.1` | | [tailwind-merge](https://github.com/dcastil/tailwind-merge) | `3.4.0` | `3.4.1` | | [react-resizable-panels](https://github.com/bvaughn/react-resizable-panels) | `4.6.2` | `4.6.4` | Updates `lucide-react` from 0.563.0 to 0.564.0 - [Release notes](https://github.com/lucide-icons/lucide/releases) - [Commits](https://github.com/lucide-icons/lucide/commits/0.564.0/packages/lucide-react) Updates `msw` from 2.12.9 to 2.12.10 - [Release notes](https://github.com/mswjs/msw/releases) - [Changelog](https://github.com/mswjs/msw/blob/main/CHANGELOG.md) - [Commits](mswjs/msw@v2.12.9...v2.12.10) Updates `pino` from 10.3.0 to 10.3.1 - [Release notes](https://github.com/pinojs/pino/releases) - [Commits](pinojs/pino@v10.3.0...v10.3.1) Updates `glob` from 13.0.1 to 13.0.3 - [Changelog](https://github.com/isaacs/node-glob/blob/main/changelog.md) - [Commits](isaacs/node-glob@v13.0.1...v13.0.3) Updates `fumadocs-core` from 16.5.2 to 16.6.1 - [Release notes](https://github.com/fuma-nama/fumadocs/releases) - [Commits](https://github.com/fuma-nama/fumadocs/commits/fumadocs-core@16.6.1) Updates `fumadocs-ui` from 16.5.2 to 16.6.1 - [Release notes](https://github.com/fuma-nama/fumadocs/releases) - [Commits](https://github.com/fuma-nama/fumadocs/commits/fumadocs-ui@16.6.1) Updates `tailwind-merge` from 3.4.0 to 3.4.1 - [Release notes](https://github.com/dcastil/tailwind-merge/releases) - [Commits](dcastil/tailwind-merge@v3.4.0...v3.4.1) Updates `react-resizable-panels` from 4.6.2 to 4.6.4 - [Release notes](https://github.com/bvaughn/react-resizable-panels/releases) - [Changelog](https://github.com/bvaughn/react-resizable-panels/blob/main/CHANGELOG.md) - [Commits](bvaughn/react-resizable-panels@4.6.2...4.6.4) --- updated-dependencies: - dependency-name: lucide-react dependency-version: 0.564.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: production-dependencies - dependency-name: msw dependency-version: 2.12.10 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: production-dependencies - dependency-name: pino dependency-version: 10.3.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: production-dependencies - dependency-name: glob dependency-version: 13.0.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: production-dependencies - dependency-name: fumadocs-core dependency-version: 16.6.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: production-dependencies - dependency-name: fumadocs-ui dependency-version: 16.6.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: production-dependencies - dependency-name: tailwind-merge dependency-version: 3.4.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: production-dependencies - dependency-name: react-resizable-panels dependency-version: 4.6.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: production-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
dependabot
bot
force-pushed
the
dependabot/npm_and_yarn/production-dependencies-ee47afc39c
branch
from
35c296d to
5d88868
Compare
Co-authored-by: hotlong <50353452+hotlong@users.noreply.github.com>
Co-authored-by: hotlong <50353452+hotlong@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Fix merge issues with main branch
fix: resolve merge conflicts between dependabot production-deps bump and main
Feb 18, 2026
dependabot
bot
deleted the branch
dependabot/npm_and_yarn/production-dependencies-ee47afc39c
Contributor
There was a problem hiding this comment.
Pull request overview
This pull request resolves merge conflicts in PR #694 (dependabot production-dependencies bump) that arose from concurrent devDependency updates landing on main. The PR merges main into the dependabot branch and regenerates the lock file.
Changes:
- Merges devDependency updates from main (including
@types/node,@types/react,@vitejs/plugin-react,happy-domupdates) - Preserves dependabot's production dependency bumps (
lucide-react,react-resizable-panels,tailwind-merge,msw,pino,glob,fumadocs-core,fumadocs-ui,@nestjs/common,@nestjs/core,@sveltejs/kit,turbo) - Regenerates
pnpm-lock.yamlwith all resolved dependencies - Adds changeset and updates ROADMAP version
Reviewed changes
Copilot reviewed 24 out of 25 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| pnpm-lock.yaml | Massive lock file regeneration reflecting all dependency updates from both main and dependabot branches |
| apps/docs/package.json | Updated fumadocs packages, lucide-react, tailwind-merge, @types/node, @types/react |
| apps/studio/package.json | Updated lucide-react, react-resizable-panels, tailwind-merge, @types/react, @vitejs/plugin-react, happy-dom, msw |
| package.json | Updated @types/node, turbo, lucide-react |
| packages/*/package.json | Consistent @types/node updates across all packages (25.2.2 → 25.2.3) |
| packages/adapters/nestjs/package.json | Updated @nestjs/common and @nestjs/core (11.1.13 → 11.1.14) |
| packages/adapters/sveltekit/package.json | Updated @sveltejs/kit (2.21.5 → 2.52.0) |
| packages/client/package.json | Updated msw (2.12.9 → 2.12.10) |
| packages/client-react/package.json | Updated @types/react (19.2.13 → 19.2.14) |
| packages/core/package.json | Updated pino (10.3.0 → 10.3.1) and @types/node |
| packages/metadata/package.json | Updated glob (13.0.1 → 13.0.5) and @types/node |
| packages/plugins/plugin-msw/package.json | Updated msw (2.12.9 → 2.12.10) and @types/node |
| .changeset/patch-release.md | Added changeset (content appears unrelated to this PR) |
| ROADMAP.md | Updated version from v3.0.2 to v3.0.6 |
Comment on lines
+1
to
+5
| --- | ||
| "@objectstack/spec": patch | ||
| --- | ||
|
|
||
| Migrate CLI architecture to oclif framework |
There was a problem hiding this comment.
The changeset content describes "Migrate CLI architecture to oclif framework" which doesn't match this PR's purpose of resolving merge conflicts. This changeset should either be removed or replaced with one that describes the dependency updates from the dependabot PR.
|
|
||
| > **Last Updated:** 2026-02-16 | ||
| > **Current Version:** v3.0.2 | ||
| > **Current Version:** v3.0.6 |
There was a problem hiding this comment.
The ROADMAP version has been bumped from v3.0.2 to v3.0.6, which is a significant jump (4 patch versions). Please verify that this version accurately reflects the current state. If this PR is simply resolving merge conflicts for a dependabot update, the version change might be premature or should be explained in the PR description.
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.
PR #694 (dependabot production-dependencies bump) became unmergeable due to concurrent devDependency updates landing on main in the same region of
apps/studio/package.json.apps/studio/package.jsondevDependencies — main bumped@types/react,@vitejs/plugin-react,happy-dom; dependabot bumpedmswon the next linelucide-react,react-resizable-panels,tailwind-merge,msw)pnpm-lock.yamlfrom the resolved stateAll 5520 tests pass.
Original prompt
💡 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.