chenBright commented on PR #3535: URL: https://github.com/apache/brpc/pull/3535#issuecomment-6073322863
The method used to resolve conflicts seems problematic, resulting in numerous diffs involving the `master` branch. I usually resolve conflicts by rebasing onto `master` and haven't encountered this issue. -- 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] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
