Swastyy commented on PR #16579:
URL: https://github.com/apache/shardingsphere/pull/16579#issuecomment-1133806158

   > Hi @Swastyy Sorry, there are some file conflicts, please fix them.
   
   Hi @RaigorJiang , the option for resolve conflicts is not working


-- 
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...@shardingsphere.apache.org

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

Reply via email to