You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@nuttx.apache.org by GitBox <gi...@apache.org> on 2021/03/21 15:07:04 UTC

[GitHub] [incubator-nuttx] xiaoxiang781216 edited a comment on pull request #3063: Integration between nuttx and pysimCoder

xiaoxiang781216 edited a comment on pull request #3063:
URL: https://github.com/apache/incubator-nuttx/pull/3063#issuecomment-803599305


   @robertobucher you can fix the confict by:
   ```
   git remote add apache git@github.com:apache/incubator-nuttx.git
   git fetch apache
   git rebase apache/master
   git push -f origin master
   ```
   But before push the new patchset, please reorganize your change into the reasonable patchset by:
   ```
   git rebase --interactive HEAD~16
   ```
   you can squash or reorder the patch from the terminal.


-- 
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:
users@infra.apache.org