nagisa-kunhah opened a new pull request, #1598:
URL: https://github.com/apache/dubbo-admin/pull/1598

   **Please provide a description of this PR:**
   
   Key commands:
   ```sh
   git fetch upstream ai develop
   
   # 1. Prepare the integration result by rebasing AI onto develop.
   git switch --no-track -c review/ai-rebase-develop upstream/ai
   git rebase upstream/develop
   
   # For each conflict: resolve the affected files, stage them,
   # and continue until the rebase finishes.
   git add <resolved-files>
   git rebase --continue
   
   # 2. Apply and test any compatibility fixes needed after the rebase.
   # In this integration, these update the MCP test mocks and remove
   # a duplicate stylesheet import.
   git add pkg/mcp/tools/detail_tools_test.go \
           pkg/mcp/tools/log/tools_test.go \
           ui-vue3/src/main.ts
   git commit -m "fix: adapt integration to develop"
   
   # Record the verified result.
   # This was 145453f in the original preparation.
   integration_commit=$(git rev-parse HEAD)
   
   # 3. Create the PR branch directly from AI's existing history.
   git switch --no-track -c review/ai-sync-develop upstream/ai
   
   # Apply the verified code snapshot as a single synchronization commit.
   git restore --source="$integration_commit" --staged --worktree -- .
   
   git diff --cached --check
   git diff --cached --exit-code "$integration_commit"
   git diff --cached --quiet -- ai
   
   git commit -m "chore: sync develop changes into ai"
   ```
   
   Validation performed on the identical integration snapshot:
   
   - Admin: go test ./... — passed.
   - AI: go test ./... — passed.
   - Frontend: yarn test:unit --run — all 56 tests passed.
   - Frontend: yarn vite build — passed.
   - git diff --cached --check — passed.
   - Frontend: yarn type-check — still reports errors, including missing type 
declarations and API reference issues. The
     updateInstanceTrafficSwitch reference issue also exists in the develop 
baseline.
   
   To help us figure out who should review this PR, please put an X in all the 
areas that this PR affects.
   
   - [X] Docs
   - [X] Installation
   - [X] User Experience
   - [ ] Dubboctl
   - [X] Console
   - [X] Core Component
   
   Please check any characteristics that apply to this pull request.
   
   - [X] Branch synchronization
   - [X] Conflict resolution and integration compatibility fixes
   - [X] Backend and frontend tests verified
   - [X] Existing AI service code preserved
   
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to