Re: [PR] [ISSUE #583]: 新增 扩展点用于实现链路追踪 [rocketmq-spring]

["RockteMQ-AI (via GitHub)" <gi...@apache.org>]

RockteMQ-AI commented on PR #735:
URL: https://github.com/apache/rocketmq-spring/pull/735#issuecomment-5129797143

   ⚠️ **Merge conflict detected**
   
   This PR has conflicts with the base branch and cannot be merged. Please rebase or merge the base branch into your branch and resolve the conflicts:
   
   ```bash
   git fetch origin
   git checkout issue-583
   git rebase origin/main
   # resolve conflicts, then:
   git push --force-with-lease
   ```
   
   This is a one-time reminder. Feel free to @mention me for a re-review after conflicts are resolved.
   
   ---
   *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: commits-unsubscribe@rocketmq.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org