langgenius/dify-docs
1
0
Fork 0
mirror of https://github.com/langgenius/dify-docs.git synced 2026-07-22 04:15:24 -04:00
Code Issues 10 Packages Projects Releases Wiki Activity

[PR #2] [MERGED] Feat: show conflict #301

New Issue
Closed
opened 2026-02-16 05:19:56 -05:00 by yindo · 0 comments
yindo commented 2026-02-16 05:19:56 -05:00
Owner
Copy Link
Copy Source

📋 Pull Request Information

Original PR: https://github.com/langgenius/dify-docs/pull/2
Author: @AllenWriter
Created: 3/18/2025
Status: ✅ Merged
Merged: 3/18/2025
Merged by: @AllenWriter

Base: main ← Head: feat/conflict

📝 Commits (4)

📊 Changes

1 file changed (+7 additions, -0 deletions)

View changed files

📝 introduction.mdx (+7 -0)

📄 Description

No description provided

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/langgenius/dify-docs/pull/2 **Author:** [@AllenWriter](https://github.com/AllenWriter) **Created:** 3/18/2025 **Status:** ✅ Merged **Merged:** 3/18/2025 **Merged by:** [@AllenWriter](https://github.com/AllenWriter) **Base:** `main` ← **Head:** `feat/conflict` --- ### 📝 Commits (4) - [`ee5a71a`](https://github.com/langgenius/dify-docs/commit/ee5a71a3e78695a2447bd45852ebff4772adb2d0) Feat: show conflict - [`1926a6f`](https://github.com/langgenius/dify-docs/commit/1926a6ff826473861b002746ce88f2ff9fb2119e) Feat: show conflict 02 - [`1cb3fcc`](https://github.com/langgenius/dify-docs/commit/1cb3fccc4e8f01dc3c77e256cebfe52a3457f7da) Update introduction.mdx - [`886c317`](https://github.com/langgenius/dify-docs/commit/886c317693e065c01fe9f4056a668e9d76183768) Feat: fix conflict ### 📊 Changes **1 file changed** (+7 additions, -0 deletions) <details> <summary>View changed files</summary> 📝 `introduction.mdx` (+7 -0) </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
yindo added the pull-request label 2026-02-16 05:19:56 -05:00
yindo closed this issue 2026-02-16 05:19:56 -05:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
bug
documentation
documentation
enhancement
pull-request
Mirrored from GitHub Pull Request
 question
stale
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-docs#301
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?