langgenius/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-07-21 12:05:30 -04:00
Code Issues 775 Packages Projects Releases 10 Wiki Activity

[PR #30315] chore: resolve merge conflicts with main branch #32773

New Issue
Closed
opened 2026-02-21 20:52:03 -05:00 by yindo · 0 comments
yindo commented 2026-02-21 20:52:03 -05:00
Owner
Copy Link
Copy Source

Original Pull Request: https://github.com/langgenius/dify/pull/30315

State: closed
Merged: Yes

Summary

Resolved merge conflicts between the es-toolkit migration PR and latest main branch. Conflicts occurred in web/package.json and web/pnpm-lock.yaml due to parallel changes in dependency management.

Resolution strategy:

  • Kept magicast in devDependencies (from feature branch)
  • Excluded lodash from devDependencies (preserves removal from PR #30313)
  • Regenerated pnpm-lock.yaml to ensure consistency with resolved package.json

This maintains the es-toolkit migration work while preventing lodash from being re-added to the project.

Screenshots

N/A - Infrastructure change only

Checklist

  • This change requires a documentation update, included: Dify Document
  • I understand that this PR may be closed in case there was no previous discussion or issues. (This doesn't apply to typos!)
  • I've added a test for each change that was introduced, and I tried as much as possible to make a single atomic change.
  • I've updated the documentation accordingly.
  • I ran dev/reformat(backend) and cd web && npx lint-staged(frontend) to appease the lint gods

💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.

**Original Pull Request:** https://github.com/langgenius/dify/pull/30315 **State:** closed **Merged:** Yes --- ## Summary Resolved merge conflicts between the es-toolkit migration PR and latest main branch. Conflicts occurred in `web/package.json` and `web/pnpm-lock.yaml` due to parallel changes in dependency management. **Resolution strategy:** - Kept `magicast` in devDependencies (from feature branch) - Excluded `lodash` from devDependencies (preserves removal from PR #30313) - Regenerated `pnpm-lock.yaml` to ensure consistency with resolved package.json This maintains the es-toolkit migration work while preventing lodash from being re-added to the project. ## Screenshots N/A - Infrastructure change only ## Checklist - [ ] This change requires a documentation update, included: [Dify Document](https://github.com/langgenius/dify-docs) - [x] I understand that this PR may be closed in case there was no previous discussion or issues. (This doesn't apply to typos!) - [x] I've added a test for each change that was introduced, and I tried as much as possible to make a single atomic change. - [x] I've updated the documentation accordingly. - [x] I ran `dev/reformat`(backend) and `cd web && npx lint-staged`(frontend) to appease the lint gods <!-- START COPILOT CODING AGENT TIPS --> --- 💬 We'd love your input! Share your thoughts on Copilot coding agent in our [2 minute survey](https://gh.io/copilot-coding-agent-survey).
yindo added the pull-request label 2026-02-21 20:52:03 -05:00
yindo closed this issue 2026-02-21 20:52:03 -05:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
Knowledge Pipeline
Proposal
WIP
cloud
dependencies
feat:webapp
good first issue
outdated
performance
pull-request
Mirrored from GitHub Pull Request
 python:uv
refactor
size:L
stale
status: accepting prs
status: blocked
status: in discussion
stt & tts
vulnerablity
web
wont-fix
🌊 feat:workflow
🌚 invalid
🐞 bug
👻 feat:rag
💪 enhancement
📚 documentation
🔨 feat:tools
🙋‍♂️ question
🙏 help wanted
🤔 cant-reproduce
🤖 feat:agent
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
yindo
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: langgenius/dify#32773
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?