zrlw commented on PR #15590: URL: https://github.com/apache/dubbo/pull/15590#issuecomment-3138508122
you'd better search some documents about how to solve git merge conflicts, ```force-merge``` should not be used if you are not familiar with the codes. and the codes which are not related to the issue which you fixed should not be changed, you'd better check them in https://github.com/apache/dubbo/pull/15590/files or your local develope IDE. -- 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...@dubbo.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
