RaigorJiang commented on pull request #12741: URL: https://github.com/apache/shardingsphere/pull/12741#issuecomment-931109273
Hi @Swastyy Don't worry, to resolve this conflict, you need to: 1. Checkout to your `local master branch`(any branch name) and synchronize from the `apache master`; 2. Checkout back to `Swastyy:12563`, and merge local master branch into current branch; 3. Resolve the conflict and modify it to the desired state; 4. Commit and 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]
