RockteMQ-AI commented on PR #1923:
URL: 
https://github.com/apache/rocketmq-dashboard/pull/1923#issuecomment-5496454517

   ⚠️ **Merge conflict detected (updated)**
   
   This PR has conflicts with the base branch again and cannot be merged. It 
looks like new conflicts appeared after the previous rebase. Please rebase onto 
the latest base branch and resolve the conflicts:
   
   ```bash
   git fetch origin
   git checkout codex/audit-dashboard
   git rebase origin/rocketmq-studio
   # resolve conflicts, then:
   git push --force-with-lease
   ```
   
   Note: This PR has already been approved ✅ — once conflicts are resolved it 
should be ready to merge (by a maintainer).
   
   ---
   *Automated notification by github-manager-bot*
   


-- 
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]

Reply via email to