ctubbsii commented on PR #3510: URL: https://github.com/apache/accumulo/pull/3510#issuecomment-1601591341
Looks like there are test failures anyway. Not sure if those are merge artifacts or implementation issues. In any case, in future scenarios like this, I recommend just merging forward the other commit with `-s ours`, and then creating a new PR to reimplement the equivalent changes in the new branch that requires re-review. That way, it can just be squash-merged directly when it's ready. -- 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]
