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 2020/10/22 15:11:09 UTC

[GitHub] [incubator-nuttx] btashton commented on pull request #2049: Added support for resolution configuration. Added option to start or not the conversion when opening ADC device.

btashton commented on pull request #2049:
URL: https://github.com/apache/incubator-nuttx/pull/2049#issuecomment-714562028


   Sill not quite right there are a bunch of merges. 
   
   Try this:
   ```
   git fetch origin
   git rebase -i origin/master
   ```
   
   This assumes that `origin` is the Apache remote and not your fork so adjust accordingly. Then select `s` instead of `pick` for the commits that you want to squash. You will then have to force push. 
   
   It's a little funky at first but after you use interactive rebase a few time I suspect you will find it a very useful tool. 


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