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 2021/01/16 19:29:17 UTC

[GitHub] [incubator-nuttx] btashton commented on pull request #2698: Added color output to syslog.

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


   I tried using the github resolve conflict tool which is actually really nice to quickly fix the conflict, but it looks like it uses merge instead of rebase so creates a merge commit.  So probably best if @fjpanag just force pushes a rebase.


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