mirror of
https://github.com/eigent-ai/eigent.git
synced 2026-05-23 21:06:50 +00:00
Resolve conflicts in: - server/uv.lock (revision number, greenlet wheel format) - src/store/chatStore.ts (merge target/displayContent and executionId/projectId params) - src/components/ChatBox/BottomBox/InputBox.tsx (merge mention and trigger/expanded features) - src/components/ChatBox/index.tsx (merge mention/direct-agent features with new unified layout) |
||
|---|---|---|
| .. | ||
| 2025_08_11_2107-0001_init_initial_schema.py | ||
| 2025_09_28_1621-d74ab2a44600_drop_mcp_user_foreign_key_constraint.py | ||
| 2025_10_15_1446-eec7242b3a9b_modify_chat_history_add_project_id.py | ||
| 2025_11_13_1731-add_timestamp_to_chat_step.py | ||
| 2026_02_06_0440-9464b9d89de7_feat_trigger.py | ||