Ouss4 commented on pull request #5147: URL: https://github.com/apache/incubator-nuttx/pull/5147#issuecomment-1004987626
> > @AlanRosenthal sorry can you try to rebase again and drop the merge commit. Looks like there are still issues. > > I tried resolving the conflict with github's web ui. looks like it's better to just use the good old fashioned CLI Github loves merge commits. I personally don't use its Web UI at all. :) -- 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-unsubscr...@nuttx.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org