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.
patacongo commented on pull request #1096:
URL: https://github.com/apache/incubator-nuttx/pull/1096#issuecomment-635633538
I think I can merge this onto a branch, fix the conflicts, then merge it to
main. That is not the preferred way of doing things, but might allow us to
make some
patacongo commented on pull request #1096:
URL: https://github.com/apache/incubator-nuttx/pull/1096#issuecomment-634609996
You probably have to force the push upstream. That should ignore that fact
that the branches has divurged and simply overwrite the old branch with the new
one.
patacongo commented on pull request #1096:
URL: https://github.com/apache/incubator-nuttx/pull/1096#issuecomment-633625863
This is an automated message from the Apache Git Service.
To respond to the message, please log on to
