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. Sometimes I just have to re-create a clean version of the branch. If force pushing does not work, then you can try tyat. There might be some better solution but I would probably do a brute force change like: - rebase the master branch - rename the old branch - re-create the branch, applying the changes from the old branch cleanly - force push the new clean branch. It would certainly be necessary to force in this case. ---------------------------------------------------------------- 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
