xiaoxiang781216 commented on PR #10470: URL: https://github.com/apache/nuttx/pull/10470#issuecomment-1722657312
@nealef you need do the following action to resolve the conflict: ``` git remote add apache [email protected]:apache/nuttx.git git fetch apache git rebase apache/master git push -f origin ``` -- 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]
