kevinrr888 commented on PR #5579: URL: https://github.com/apache/accumulo/pull/5579#issuecomment-2904766305
> When merging forward to the main branch, there are a few lines to modify in the CI script. However, there is currently a merge conflict from https://github.com/apache/accumulo/pull/5571 that will need to be merged into main and resolved first. Merged through main. Fixed the couple lines in the script for main (7fd7762f10d06acc9b7e607ef5c1a956eb01d3ba). I am not sure what merge conflict you were talking about with #5571, though. That was merged before your comment, and this PR didn't have any merge conflicts -- 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: notifications-unsubscr...@accumulo.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
