[GitHub] [incubator-nuttx] acassis commented on pull request #3208: Support for CAN bus and qencoder for stm32f7-nucleo144 board

[GitBox <gi...@apache.org>]

acassis commented on pull request #3208:
URL: https://github.com/apache/incubator-nuttx/pull/3208#issuecomment-808929697


   Hi @robertobucher github is reporting this warning:
   
   "This branch cannot be rebased safely
   Rebasing the commits of this branch on top of the base branch cannot be performed automatically as this would create a different result than a regular merge."
   
   The best way to fix it is rebasing your branch with the master branch before submitting.
   
   ```
   I follow these steps after creating my github fork:
   
   $ git clone https://github.com/acassis/incubator-nuttx
   
   $ git remote add upstream git@github.com:apache/incubator-nuttx.git
   
   $ git pull upstream master
   
   $ git checkout -b upstream upstream/master
   
   $ git push origin master
   
   The you can create branches:
   
   $ git checkout -b newbranchfornewfeature
   
   $ git push -u origin newbranchfornewfeature
   
   /* do your modifications and commits */
   
   Before submitting the new branch I do it:
   
   $ git checkout upstream
   
   $ git pull
   
   /* Now my local upstream branch synced with mainline */
   
   Let return to my branch and rebase it:
   
   $ git checkout newbranchfornewfeature
   
   $ git rebase upstream
   
   Push the commits of my branch to my github:
   
   $ git push
   
   Using the github interface submit the new feature to NuttX mainline.
   ```


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