kyooosukedn commented on PR #25041:
URL: https://github.com/apache/shardingsphere/pull/25041#issuecomment-1550926825

   I have resolved the conflicts from my changes locally and rebased the 
branch. However, upon opening this pull request I noticed that there are 
additional commits from other contributors that have introduced new conflicts. 
I tried to revert from my rebase commit but it didn't update the branch either. 
I'm not sure what to do next.. do you have any suggestion?


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