acassis commented on PR #11291: URL: https://github.com/apache/nuttx/pull/11291#issuecomment-1850284495
> > @royratcliffe could you rearrange your patch and fix the conflict? > > Thanks @xiaoxiang781216. Will do. @royratcliffe I think what Xiang was saying it to squash some these commits, there are some ¨fix typo" that could be squashed in a single command. Please refer to our documentation explaining how to do that: https://nuttx.apache.org/docs/latest/contributing/making-changes.html#how-to-include-the-suggestions-on-your-pull-request Other suggestion: use rebase instead of merge to keep your branch in sync with upstream. Our documentation how explain how to create the upstream, how to keep in sync, etc. Any issue, please don't hesitate to ask, ok? -- 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
