Repository navigation
Commit 785dc86
Merge origin/main into fix/hosted-approval-redelivery
Resolve the WorkspaceMigrationMySqlIT containsExactly conflict by taking the
ascending union of both sides' migration versions (59, 60 from this branch,
62 from main), matching the merged db/migration set.
Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
Patrol-Run: qwen-pr-conflict/jmv2cx7ur0s192 files changed
Lines changed: 29281 additions & 2679 deletions
File tree
- .github/scripts
- .qwen
- e2e-tests
- skills/verify-pr
- docs/design
- packages
- acp-bridge/src
- cli
- src
- acp-integration/session
- config
- serve
- ui
- opentui
- utils
- core/src
- agents/runtime
- config
- core/loggingContentGenerator
- managed-runtime
- services
- telemetry
- tools
- sdk-java
- managed-agent-server/src
- main
- java/com/alibaba/qwen/code/managedagent
- api
- service
- store
- resources
- db/migration
- openapi
- test/java/com/alibaba/qwen/code/managedagent
- api
- service
- store
- qwencode/src
- main/java/com/alibaba/qwen/code/daemon
- test/java/com/alibaba/qwen/code/daemon
- sdk-typescript
- src
- daemon-mcp/serve-bridge
- daemon
- ui
- test
- unit
- vscode-ide-companion/src/services
- web-shell
- client
- components
- managed/generated
- sidebar
- workspaces
- config
- daemon/workspace
- e2e
- utils
- scripts/tests
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
15 | 20 | | |
16 | 21 | | |
17 | 22 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
70 | 70 | | |
71 | 71 | | |
72 | 72 | | |
73 | | - | |
| 73 | + | |
74 | 74 | | |
75 | 75 | | |
76 | 76 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
237 | 237 | | |
238 | 238 | | |
239 | 239 | | |
240 | | - | |
241 | | - | |
242 | | - | |
243 | | - | |
244 | | - | |
245 | | - | |
246 | | - | |
247 | | - | |
248 | | - | |
249 | | - | |
250 | | - | |
251 | | - | |
252 | | - | |
253 | | - | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
254 | 259 | | |
255 | 260 | | |
256 | 261 | | |
| |||
0 commit comments