patacongo commented on pull request #1096: URL: https://github.com/apache/incubator-nuttx/pull/1096#issuecomment-635639534
I pulled the changes, resolved the conflicts, and merged to master. I will now have to close this PR. Please verify that the changes are in place correctly. This is not the correct way to do things. We will need to be more careful in the future. For one thing, please always allow maintainer access to the branch to we can help you out of such difficulties without resorting to these kind of steps. ---------------------------------------------------------------- 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: us...@infra.apache.org