Pace2Car commented on issue #29233: URL: https://github.com/apache/shardingsphere/issues/29233#issuecomment-1920934712
> Hi @Pace2Car I created this new branch from **_master_**branch. Also previously I did "git merge origin/master " into my development branch. I got the same conflicts both the times. Can you please tell how to resolve this issues? You need to configure the remote repository "git remote add apache https://github.com/apache/shardingsphere.git";, then "git checkout" your development branch, then "git merge apache/master", resolve conflicts and "git push". -- 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]
