You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@rocketmq.apache.org by "RockteMQ-AI (via GitHub)" <gi...@apache.org> on 2026/09/07 17:40:48 UTC

Re: [PR] [ISSUE #260]set yarnVersion=v1.22.22 [rocketmq-dashboard]

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

   ⚠️ **Merge conflict detected**
   
   This PR has conflicts with the `master` branch and cannot be merged. Please rebase or merge `master` into your branch and resolve the conflicts:
   
   ```bash
   git fetch origin
   git checkout master
   git rebase origin/master
   # 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