Netter99 commented on PR #25036: URL: https://github.com/apache/shardingsphere/pull/25036#issuecomment-1501741933
> > Sorry, I don't understand what this mean. I delete the local and remote 'temp' branch. I am not sure whether it works or not. > > If you have prepared the environment according to the developer guide run > > ``` > git checkout yourBranch > git merge apache/master > git push origin yourBranch > ``` > > Replace `yourBranch` to your real branch(the branch that initiated this PR) name I run the command as you say, it appears like this.  If there are still conflicts, may I close the current PR and make a new one? -- 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]
