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 2022/10/25 23:30:31 UTC

[GitHub] [incubator-nuttx] acassis commented on pull request #7428: New files for pysimCoder

acassis commented on PR #7428:
URL: https://github.com/apache/incubator-nuttx/pull/7428#issuecomment-1291246549

   @robertobucher you need to follow the workflow explained here:
   https://nuttx.apache.org/docs/latest/contributing/making-changes.html#git-workflow-with-an-upstream-repository
   
   After creating your commits in your separated branch you need to rebase with mainline (upstream) instead of merging to it.
   
   Basically you will do:
   ```
   $ git rebase upstream/master
   ```
   
   Normally I only do:
   ```
   $ git rebase upstream
   ```
   
   It is enough to sync my branch with the upstream code (remember that you need to do "git pull" in the upstream branch before doing it and you need to do it from your development branch)


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org