imjoey commented on pull request #169: URL: https://github.com/apache/apisix-website/pull/169#issuecomment-774814093
Hi @KishaniKandasamy , the conflict seems that you did not rebase with latest code. Please use the latest code and then do any changes. As for now, I guess you could run `git fetch upstream && git rebase upstream/master` in your local branch and use `git push origin Kisha -f` to force a push to update this PR. Thanks ---------------------------------------------------------------- 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. For queries about this service, please contact Infrastructure at: [email protected]
