hartmannathan commented on issue #745: [DO NOT MERGE] arch/stm32h7: Explicit support for all STM32H7x3xx URL: https://github.com/apache/incubator-nuttx/pull/745#issuecomment-613053829 > @hartmannathan - I think you wanted to rebase and force push? > > git reset --hard the commit befoe the mess. > git fetch APPACHE_REMOTE > git rebase APPACHE_REMOTE/master > git push -f THIS REMOTE branch name I did rebase, and pushed without force. The difference is that I synced my fork to upstream with: Sometime previously: git remote add upstream https://github.com/apache/incubator-nuttx.git Today: git fetch upstream git checkout master git rebase upstream/master git push origin Then I rebased my stm32h7x3xx branch onto my updated master with: git checkout stm32h7x3xx git rebase master git push I'm not sure why, the rebase produced a merge commit. So now it's showing a bunch of unrelated commits as part of this PR. That's totally messed up.
---------------------------------------------------------------- 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 With regards, Apache Git Services
