EricGao888 commented on PR #12265: URL: https://github.com/apache/dolphinscheduler/pull/12265#issuecomment-1272942858
> > @wushanru file named glossary had changed ,above conflict with you fix code > > @fuchanghai My first PR, this conflict is also the first time to resolve, I don't quite understand your meaning, please tell me the specific steps, thank you！ @wushanru Looks like you didn't correctly rebase your code and pushed the dev branch instead. Please refer to this link for instructions: https://github.com/sevntu-checkstyle/sevntu.checkstyle/wiki/Development-workflow-with-Git:-Fork,-Branching,-Commits,-and-Pull-Request -- 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]
